diff --git a/.quixos-subtree-source.json b/.quixos-subtree-source.json index 9a75d07..245945a 100644 --- a/.quixos-subtree-source.json +++ b/.quixos-subtree-source.json @@ -1,7 +1,7 @@ { "version": 1, "sourceRepo": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/quixos.git", - "sourceCommit": "988bb022bf279fb83d8720c239844a272c676e67", + "sourceCommit": "0afd5b03b7640bf6962d3059cd50aef76a3b56da", "sourcePath": "quixos-instance/packages/camino-package-runtime", "exportName": "camino-package-runtime", "mirrorRemote": "https://gitea-external.egads.tutti.syntaxblitz.net/quixos/camino-package-runtime.git" diff --git a/dist/schema-compiler.d.ts.map b/dist/schema-compiler.d.ts.map index aa1fdd9..9f30bdf 100644 --- a/dist/schema-compiler.d.ts.map +++ b/dist/schema-compiler.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"schema-compiler.d.ts","sourceRoot":"","sources":["../src/schema-compiler.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,EAeV,mBAAmB,EAIpB,MAAM,gBAAgB,CAAC;AAw2BxB,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,KACjB,OAAO,CAAC;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAA;CAAE,CAqC7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,YAAY,MAAM,KACjB,OAAO,CAAC,mBAAmB,CAsC7B,CAAC"} \ No newline at end of file +{"version":3,"file":"schema-compiler.d.ts","sourceRoot":"","sources":["../src/schema-compiler.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,KAAK,EAeV,mBAAmB,EAIpB,MAAM,gBAAgB,CAAC;AAq2BxB,eAAO,MAAM,oBAAoB,GAC/B,YAAY,MAAM,KACjB,OAAO,CAAC;IAAE,kBAAkB,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAA;CAAE,CAqC7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,YAAY,MAAM,KACjB,OAAO,CAAC,mBAAmB,CAsC7B,CAAC"} \ No newline at end of file diff --git a/dist/schema-compiler.js b/dist/schema-compiler.js index 54f4f5b..da3187b 100644 --- a/dist/schema-compiler.js +++ b/dist/schema-compiler.js @@ -511,9 +511,8 @@ const classSchemaFromType = (type, sourceFile, defaults, operationServices) => { if (!declaredToEndpoint.projection) { throw new Error(`Edge field ${type.fullName}.${field.name} requires other_endpoint.projection or inverse`); } - const sourceType = typeRefForField(field, defaults.schemaVersion); - if (sourceType.symbol?.namespace !== "camino" || - sourceType.symbol.name !== "Ref") { + const sourceProtoType = field.resolvedType?.fullName?.replace(/^\./, ""); + if (sourceProtoType !== "camino.Ref") { throw new Error(`Edge field ${type.fullName}.${field.name} must use camino.Ref`); } const isMany = isManyCardinality(declaredFromEndpoint.cardinality); diff --git a/src/schema-compiler.ts b/src/schema-compiler.ts index ee10ce7..e5d2c02 100644 --- a/src/schema-compiler.ts +++ b/src/schema-compiler.ts @@ -718,11 +718,8 @@ const classSchemaFromType = ( `Edge field ${type.fullName}.${field.name} requires other_endpoint.projection or inverse`, ); } - const sourceType = typeRefForField(field, defaults.schemaVersion); - if ( - sourceType.symbol?.namespace !== "camino" || - sourceType.symbol.name !== "Ref" - ) { + const sourceProtoType = field.resolvedType?.fullName?.replace(/^\./, ""); + if (sourceProtoType !== "camino.Ref") { throw new Error(`Edge field ${type.fullName}.${field.name} must use camino.Ref`); } const isMany = isManyCardinality(declaredFromEndpoint.cardinality);