laurin
/
ldo-compact-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint autofix

Browse Source
main
Laurin Weger 3 weeks ago
parent 4cea4838d1
commit ed7bbe65ab
No known key found for this signature in database
GPG Key ID: 9B372BB0B792770F
2 changed files with 35 additions and 35 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      packages/ldo/src/util.ts
  2. 60
      packages/schema-converter-shex/src/typing/ShexJTypingTransformerCompact.ts

10
packages/ldo/src/util.ts
Unescape View File

@ -32,7 +32,7 @@ export type LdoCompactBase = LdoBase & { id: string };
* @returns A node
*/
export function normalizeNodeName<NodeType extends AnyNode>(
input: NodeType | string
input: NodeType | string,
): NodeType {
return (typeof input === "string" ? namedNode(input) : input) as NodeType;
}
@ -43,13 +43,13 @@ export function normalizeNodeName<NodeType extends AnyNode>(
* @returns An array of nodes
*/
export function normalizeNodeNames<NodeType extends AnyNode>(
inputs: (NodeType | string)[]
inputs: (NodeType | string)[],
): NodeType[] {
return inputs.map((input) => normalizeNodeName<NodeType>(input));
}
export function canDatasetStartTransaction(
dataset: Dataset
dataset: Dataset,
): dataset is ISubscribableDataset<Quad> {
return (
typeof (dataset as ISubscribableDataset).startTransaction === "function"
@ -57,13 +57,13 @@ export function canDatasetStartTransaction(
}
export function isTransactionalDataset(
dataset: Dataset
dataset: Dataset,
): dataset is ITransactionDataset<Quad> {
return typeof (dataset as ITransactionDataset).commit === "function";
}
export function getTransactionalDatasetFromLdo(
ldo: LdoBase
ldo: LdoBase,
): [ITransactionDataset<Quad>, SubjectProxy | SetProxy] {
const proxy = getProxyFromObject(ldo);
const dataset = proxy[_getUnderlyingDataset];

60
packages/schema-converter-shex/src/typing/ShexJTypingTransformerCompact.ts
Unescape View File

@ -13,11 +13,11 @@ export interface CompactTransformerContext {
}
function commentFromAnnotations(
annotations?: Annotation[]
annotations?: Annotation[],
): string | undefined {
const commentAnnotationObject = annotations?.find(
(annotation) =>
annotation.predicate === "http://www.w3.org/2000/01/rdf-schema#comment"
annotation.predicate === "http://www.w3.org/2000/01/rdf-schema#comment",
)?.object;
if (typeof commentAnnotationObject === "string")
return commentAnnotationObject;
@ -73,7 +73,7 @@ function resolveCollisions(props: dom.PropertyDeclaration[]): void {
if (list.length < 2) return;
const predicateIris = new Set(
list.map((p) => predicateIriByProp.get(p)).filter(Boolean)
list.map((p) => predicateIriByProp.get(p)).filter(Boolean),
);
if (predicateIris.size < 2) {
return;
@ -92,7 +92,7 @@ function resolveCollisions(props: dom.PropertyDeclaration[]): void {
// Detect any remaining duplicates after first pass
const nameCounts = new Map<string, number>();
list.forEach((p) =>
nameCounts.set(p.name, (nameCounts.get(p.name) || 0) + 1)
nameCounts.set(p.name, (nameCounts.get(p.name) || 0) + 1),
);
list.forEach((p) => {
if (nameCounts.get(p.name)! > 1) {
@ -110,7 +110,7 @@ function resolveCollisions(props: dom.PropertyDeclaration[]): void {
// - if both are Set<A>, Set<B> -> Set<A|B>
// - preserve optional flag if any occurrence optional
function dedupeCompactProperties(
props: dom.PropertyDeclaration[]
props: dom.PropertyDeclaration[],
): dom.PropertyDeclaration[] {
const byName: Record<string, dom.PropertyDeclaration> = {};
const isSetRef = (t: dom.Type): t is dom.NamedTypeReference =>
@ -169,7 +169,7 @@ function dedupeCompactProperties(
let mergedType: dom.Type;
if (existingSet && newSet) {
mergedType = toSet(
makeUnion(getSetInner(existing.type), getSetInner(p.type))
makeUnion(getSetInner(existing.type), getSetInner(p.type)),
);
} else if (existingSet && !newSet) {
mergedType = toSet(makeUnion(getSetInner(existing.type), p.type));
@ -241,7 +241,7 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
shapeInterface.shapeId = shapeDecl.id;
if (
!shapeInterface.members.find(
(m) => m.kind === "property" && m.name === "id"
(m) => m.kind === "property" && m.name === "id",
)
) {
shapeInterface.members.unshift(
@ -249,14 +249,14 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
"id",
dom.create.namedTypeReference("IRI"),
// Root interfaces should have mandatory id
dom.DeclarationFlags.None
)
dom.DeclarationFlags.None,
),
);
}
return shapeInterface;
}
throw new Error(
"Unsupported direct shape expression on ShapeDecl for compact format."
"Unsupported direct shape expression on ShapeDecl for compact format.",
);
},
},
@ -275,14 +275,14 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
"interface")
) {
newInterface.members.push(
...(transformedChildren.expression as dom.ObjectType).members
...(transformedChildren.expression as dom.ObjectType).members,
);
} else if (
(transformedChildren.expression as dom.PropertyDeclaration)?.kind ===
"property"
) {
newInterface.members.push(
transformedChildren.expression as dom.PropertyDeclaration
transformedChildren.expression as dom.PropertyDeclaration,
);
}
if (transformedChildren.extends) {
@ -291,11 +291,11 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
if (extInt.kind === "interface") {
const merged = [
...extInt.members.filter(
(m) => !(m.kind === "property" && m.name === "id")
(m) => !(m.kind === "property" && m.name === "id"),
),
...newInterface.members,
].filter(
(m): m is dom.PropertyDeclaration => m.kind === "property"
(m): m is dom.PropertyDeclaration => m.kind === "property",
);
newInterface.members = dedupeCompactProperties(merged);
}
@ -339,7 +339,7 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
if ((m as any).kind === "property") {
inputProps.push(m as dom.PropertyDeclaration);
}
}
},
);
}
});
@ -357,13 +357,13 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
getTransformedChildren,
_setReturnPointer,
node,
context
context,
) => {
const transformedChildren = await getTransformedChildren();
const rdfTypes = getRdfTypesForTripleConstraint(node);
const baseName = context.getNameFromIri(
tripleConstraint.predicate,
rdfTypes[0]
rdfTypes[0],
);
const max = tripleConstraint.max;
const isPlural = max === -1 || (max !== undefined && max !== 1);
@ -379,7 +379,7 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
) {
valueType = dom.create.objectType(
(valueType as dom.InterfaceDeclaration)
.members as dom.PropertyDeclaration[]
.members as dom.PropertyDeclaration[],
);
}
@ -407,7 +407,7 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
const hasPrim = u.members.some(isPrimitiveLike);
if (isPlural && hasObj && hasPrim) {
throw new Error(
`Mixed plural union (object + primitive) not supported for predicate ${tripleConstraint.predicate}`
`Mixed plural union (object + primitive) not supported for predicate ${tripleConstraint.predicate}`,
);
}
}
@ -444,15 +444,15 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
m as unknown as { members?: dom.PropertyDeclaration[] }
).members;
const hasId = (anonMembers || []).some(
(mm) => mm.name === "id"
(mm) => mm.name === "id",
);
if (!hasId && anonMembers) {
anonMembers.unshift(
dom.create.property(
"id",
dom.create.namedTypeReference("IRI"),
dom.DeclarationFlags.None
)
dom.DeclarationFlags.None,
),
);
}
}
@ -470,8 +470,8 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
dom.create.property(
"id",
dom.create.namedTypeReference("IRI"),
dom.DeclarationFlags.None
)
dom.DeclarationFlags.None,
),
);
}
valueForRecord = anon as dom.Type;
@ -508,8 +508,8 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
dom.create.property(
"id",
dom.create.namedTypeReference("IRI"),
dom.DeclarationFlags.None
)
dom.DeclarationFlags.None,
),
);
}
}
@ -527,8 +527,8 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
dom.create.property(
"id",
dom.create.namedTypeReference("IRI"),
dom.DeclarationFlags.None
)
dom.DeclarationFlags.None,
),
);
}
}
@ -541,7 +541,7 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
(valueType as dom.InterfaceDeclaration).name
) {
finalType = dom.create.namedTypeReference(
(valueType as dom.InterfaceDeclaration).name
(valueType as dom.InterfaceDeclaration).name,
);
} else {
finalType = valueType;
@ -551,7 +551,7 @@ export const ShexJTypingTransformerCompact = ShexJTraverser.createTransformer<
const prop = dom.create.property(
baseName,
finalType,
isOptional ? dom.DeclarationFlags.Optional : dom.DeclarationFlags.None
isOptional ? dom.DeclarationFlags.Optional : dom.DeclarationFlags.None,
);
predicateIriByProp.set(prop, tripleConstraint.predicate);
prop.jsDocComment =

Write Preview
Loading…
Cancel
Save