@smartive/graphql-magic 23.4.0-next.9 → 23.5.0-next.1

package/CHANGELOG.md

@@ -1,6 +1,20 @@
-## [23.4.0-next.9](https://github.com/smartive/graphql-magic/compare/v23.4.0-next.8...v23.4.0-next.9) (2026-02-05)
+## [23.5.0-next.1](https://github.com/smartive/graphql-magic/compare/v23.4.1...v23.5.0-next.1) (2026-02-09)
+
+### Features
+
+* functions.sql and expression fiedls ([65d7079](https://github.com/smartive/graphql-magic/commit/65d7079b54da3a11300cb714a7ca70032e591204))
+* Use functions.ts instead of functions.sql ([58e0653](https://github.com/smartive/graphql-magic/commit/58e065347b2f3f1c80691911b5191af38586c1e2))
 
 ### Bug Fixes
 
-* Generated expression handling ([7c98ba8](https://github.com/smartive/graphql-magic/commit/7c98ba81ab4629c837ac947f643ea4da795ebe5d))
-* Index ([5b5f8dc](https://github.com/smartive/graphql-magic/commit/5b5f8dc6e8bc3ff1fa5d071f4bf3ac0bea7161f6))
+* Functions code order ([cf7f7a4](https://github.com/smartive/graphql-magic/commit/cf7f7a4421e8297af866c3ecc04b5e672862e6ab))
+* Generated expression handling ([e325eb2](https://github.com/smartive/graphql-magic/commit/e325eb232b7bbbbe7d65f9fae5221f4a764a8600))
+* improve handling of missing revision fields in migration updates ([4296662](https://github.com/smartive/graphql-magic/commit/429666247224ef782280fd6144cb749468b934cd))
+* Index ([42d109f](https://github.com/smartive/graphql-magic/commit/42d109fc6dbbf8fc7937f076403a69885779d8f6))
+* Linting ([2e997e4](https://github.com/smartive/graphql-magic/commit/2e997e464371a9d8cf05ceb67a6cd29a9452f615))
+* Omit more stuff ([df2ae04](https://github.com/smartive/graphql-magic/commit/df2ae044557166e876b7646d6ebe67a78df2722e))
+* Permissions ([c198115](https://github.com/smartive/graphql-magic/commit/c19811552ac3de05d4c1069116620067ec0a5540))
+* Temporarily disable tags ([52962c1](https://github.com/smartive/graphql-magic/commit/52962c1a792c1ae010ae542c23d50dd4f8486dde))
+* Trigger release ([2cd67b9](https://github.com/smartive/graphql-magic/commit/2cd67b91d33d101793c04eb87ad9c226bc0fdd0f))
+* Trigger release ([d5ac376](https://github.com/smartive/graphql-magic/commit/d5ac376533460921a638c71f4c9a69c83a057897))
+* Update functions ([3717f8a](https://github.com/smartive/graphql-magic/commit/3717f8aba9d908fbde8d2f49e7c21f87fe6a8d12))

package/dist/bin/gqm.cjs

@@ -2821,6 +2821,72 @@ var VISITOR = {
   }),
   [import_ts_morph2.SyntaxKind.SpreadElement]: (node, context) => staticEval(node.getExpression(), context),
   [import_ts_morph2.SyntaxKind.SpreadAssignment]: (node, context) => staticEval(node.getExpression(), context),
+  [import_ts_morph2.SyntaxKind.ImportSpecifier]: (node, context) => {
+    const nameNode = node.getNameNode();
+    const name2 = nameNode.getText();
+    if (name2 in KNOWN_IDENTIFIERS) {
+      return KNOWN_IDENTIFIERS[name2];
+    }
+    if (nameNode instanceof import_ts_morph2.StringLiteral) {
+      throw new Error(`Cannot handle computed import specifier: ${name2}. Only static imports are supported.`);
+    }
+    const definitions = nameNode.getDefinitionNodes();
+    let externalDefinition = definitions.find((d) => d.compilerNode !== node.compilerNode);
+    if (!externalDefinition) {
+      const importDeclaration = node.getImportDeclaration();
+      let sourceFile = importDeclaration.getModuleSpecifierSourceFile();
+      if (!sourceFile) {
+        const moduleSpecifier = importDeclaration.getModuleSpecifierValue();
+        const project = node.getProject();
+        if (moduleSpecifier.startsWith("@/")) {
+          const suffix = moduleSpecifier.substring(2);
+          sourceFile = project.getSourceFiles().find((sf) => {
+            const filePath = sf.getFilePath();
+            return filePath.endsWith(`/${suffix}.ts`) || filePath.endsWith(`/${suffix}.tsx`) || filePath.endsWith(`/${suffix}/index.ts`) || filePath.endsWith(`/${suffix}/index.tsx`);
+          });
+          if (!sourceFile) {
+            const candidates = [
+              `src/${suffix}.ts`,
+              `src/${suffix}.tsx`,
+              `src/${suffix}/index.ts`,
+              `src/${suffix}/index.tsx`
+            ];
+            for (const candidate of candidates) {
+              try {
+                const added = project.addSourceFileAtPathIfExists(candidate);
+                if (added) {
+                  sourceFile = added;
+                  break;
+                }
+              } catch {
+              }
+            }
+          }
+        }
+      }
+      if (sourceFile) {
+        const localName = node.getName();
+        const propertyName = node.compilerNode.propertyName?.getText();
+        const exportedName = propertyName ?? localName;
+        const exportedDeclarations = sourceFile.getExportedDeclarations();
+        const declarations = exportedDeclarations.get(exportedName);
+        const declaration = declarations?.[0];
+        if (declaration) {
+          externalDefinition = declaration;
+        }
+      }
+    }
+    if (externalDefinition && externalDefinition.getKind() === import_ts_morph2.SyntaxKind.ImportSpecifier) {
+      return staticEval(externalDefinition, context);
+    }
+    if (!externalDefinition) {
+      const importDeclaration = node.getImportDeclaration();
+      throw new Error(
+        `No definition node found for import specifier '${name2}' imported from '${importDeclaration.getModuleSpecifierValue()}'.`
+      );
+    }
+    return staticEval(externalDefinition, context);
+  },
   [import_ts_morph2.SyntaxKind.Identifier]: (node, context) => {
     const identifierName = node.getText();
     if (identifierName in KNOWN_IDENTIFIERS) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartive/graphql-magic",
-  "version": "23.4.0-next.9",
+  "version": "23.5.0-next.1",
   "description": "",
   "repository": {
     "type": "git",
@@ -68,7 +68,7 @@
     "knex": "^3.0.1"
   },
   "devDependencies": {
-    "@smartive/eslint-config": "7.0.0",
+    "@smartive/eslint-config": "7.0.1",
     "@smartive/prettier-config": "3.1.2",
     "@types/jest": "30.0.0",
     "@types/lodash": "4.17.23",
@@ -77,7 +77,7 @@
     "conventional-changelog-conventionalcommits": "9.1.0",
     "create-ts-index": "1.14.0",
     "del-cli": "7.0.0",
-    "esbuild": "0.27.2",
+    "esbuild": "0.27.3",
     "eslint": "9.39.2",
     "jest": "30.2.0",
     "mock-knex": "0.4.13",

package/src/bin/gqm/static-eval.ts

@@ -4,10 +4,12 @@ import {
   CaseClause,
   ElementAccessExpression,
   Identifier,
+  ImportSpecifier,
   Node,
   ObjectLiteralExpression,
   PrefixUnaryExpression,
   ShorthandPropertyAssignment,
+  StringLiteral,
   SyntaxKind,
   TemplateExpression,
   TemplateTail,
@@ -77,6 +79,106 @@ const VISITOR: Visitor<unknown, Dictionary<unknown>> = {
   }),
   [SyntaxKind.SpreadElement]: (node, context) => staticEval(node.getExpression(), context),
   [SyntaxKind.SpreadAssignment]: (node, context) => staticEval(node.getExpression(), context),
+  [SyntaxKind.ImportSpecifier]: (node: ImportSpecifier, context) => {
+    const nameNode = node.getNameNode();
+    const name = nameNode.getText();
+
+    if (name in KNOWN_IDENTIFIERS) {
+      return KNOWN_IDENTIFIERS[name];
+    }
+
+    if (nameNode instanceof StringLiteral) {
+      throw new Error(`Cannot handle computed import specifier: ${name}. Only static imports are supported.`);
+    }
+
+    const definitions = nameNode.getDefinitionNodes();
+    // Filter out the node itself to prevent infinite recursion
+    // We compare compilerNode references to handle distinct ts-morph wrapper instances
+    let externalDefinition = definitions.find((d) => d.compilerNode !== node.compilerNode);
+
+    // Fallback: If definition navigation fails (e.g. path aliases), try resolving module manually
+    if (!externalDefinition) {
+      const importDeclaration = node.getImportDeclaration();
+      let sourceFile = importDeclaration.getModuleSpecifierSourceFile();
+
+      // If ts-morph failed to find the file (common with aliases without project config), try manual lookup
+      if (!sourceFile) {
+        const moduleSpecifier = importDeclaration.getModuleSpecifierValue();
+        const project = node.getProject();
+
+        if (moduleSpecifier.startsWith('@/')) {
+          const suffix = moduleSpecifier.substring(2);
+
+          // 1. Check if the file is already loaded in the project
+          sourceFile = project.getSourceFiles().find((sf) => {
+            const filePath = sf.getFilePath();
+            // Check for direct match or index file
+            return (
+              filePath.endsWith(`/${suffix}.ts`) ||
+              filePath.endsWith(`/${suffix}.tsx`) ||
+              filePath.endsWith(`/${suffix}/index.ts`) ||
+              filePath.endsWith(`/${suffix}/index.tsx`)
+            );
+          });
+
+          // 2. If not loaded, try to find and add it from disk (heuristic: @/ -> src/)
+          if (!sourceFile) {
+            const candidates = [
+              `src/${suffix}.ts`,
+              `src/${suffix}.tsx`,
+              `src/${suffix}/index.ts`,
+              `src/${suffix}/index.tsx`,
+            ];
+
+            for (const candidate of candidates) {
+              try {
+                // addSourceFileAtPathIfExists resolves relative to CWD
+                const added = project.addSourceFileAtPathIfExists(candidate);
+                if (added) {
+                  sourceFile = added;
+                  break;
+                }
+              } catch {
+                // Ignore load errors
+              }
+            }
+          }
+        }
+      }
+
+      if (sourceFile) {
+        // Use property path if aliased (import { RealName as Alias }), otherwise name
+        // The import specifier is { propertyName as name }
+        // If propertyName is undefined, then propertyName is name
+        // We want the original propertyName to look up exports
+        const localName = node.getName();
+        const propertyName = node.compilerNode.propertyName?.getText();
+        const exportedName = propertyName ?? localName;
+
+        const exportedDeclarations = sourceFile.getExportedDeclarations();
+        const declarations = exportedDeclarations.get(exportedName);
+        const declaration = declarations?.[0];
+
+        if (declaration) {
+          externalDefinition = declaration;
+        }
+      }
+    }
+
+    // Handle re-exports: if the definition is another ImportSpecifier (in a different file), recurse
+    if (externalDefinition && externalDefinition.getKind() === SyntaxKind.ImportSpecifier) {
+      return staticEval(externalDefinition, context);
+    }
+
+    if (!externalDefinition) {
+      const importDeclaration = node.getImportDeclaration();
+      throw new Error(
+        `No definition node found for import specifier '${name}' imported from '${importDeclaration.getModuleSpecifierValue()}'.`,
+      );
+    }
+
+    return staticEval(externalDefinition, context);
+  },
   [SyntaxKind.Identifier]: (node: Identifier, context) => {
     const identifierName = node.getText();
     if (identifierName in KNOWN_IDENTIFIERS) {