@webda/graphql 4.0.0-beta.5 → 4.0.0-beta.7

package/lib/types/any.js

@@ -1,26 +1,34 @@
-import { GraphQLScalarType, Kind } from "graphql";
+import { GraphQLScalarType, Kind, valueFromASTUntyped } from "graphql";
 /**
- * Coerce an arbitrary value into an object — parses JSON strings, passes objects through
- * @param value - value to coerce
- * @returns parsed object, the value itself if already an object, or null
+ * Read a string as JSON when it looks like a JSON object or array
+ * @param value - the string
+ * @returns the parsed value, or the string itself
  */
-function coerceAny(value) {
-    return typeof value === "object" ? value : typeof value === "string" ? JSON.parse(value) : null;
+function fromJSONString(value) {
+    const text = value.trim();
+    if (!text.startsWith("{") && !text.startsWith("[")) {
+        return value;
+    }
+    try {
+        return JSON.parse(text);
+    }
+    catch {
+        return value;
+    }
+}
+/**
+ * Values pass through unchanged (objects, arrays, numbers, booleans, strings)
+ * @param value - value to pass
+ * @returns the value, null for undefined
+ */
+function passThrough(value) {
+    return value === undefined ? null : value;
 }
 export const AnyScalarType = new GraphQLScalarType({
     name: "Object",
-    description: "Arbitrary object",
-    parseValue: coerceAny,
-    serialize: coerceAny,
-    parseLiteral: ast => {
-        switch (ast.kind) {
-            case Kind.STRING:
-                return JSON.parse(ast.value);
-            case Kind.OBJECT:
-                throw new Error(`Not sure what to do with OBJECT for ObjectScalarType`);
-            default:
-                return null;
-        }
-    }
+    description: "Arbitrary value: object, array, number, boolean or string",
+    parseValue: passThrough,
+    serialize: passThrough,
+    parseLiteral: (ast, variables) => ast.kind === Kind.STRING ? fromJSONString(ast.value) : valueFromASTUntyped(ast, variables)
 });
 //# sourceMappingURL=any.js.map

package/lib/types/any.js.map

@@ -1 +1 @@
-{"version":3,"file":"any.js","sourceRoot":"","sources":["../../src/types/any.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAElD;;;;GAIG;AACH,SAAS,SAAS,CAAC,KAAU;IAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAClG,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,iBAAiB,CAAC;IACjD,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,kBAAkB;IAC/B,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,GAAG,CAAC,EAAE;QAClB,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,IAAI,CAAC,MAAM;gBACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC/B,KAAK,IAAI,CAAC,MAAM;gBACd,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"any.js","sourceRoot":"","sources":["../../src/types/any.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEvE;;;;GAIG;AACH,SAAS,cAAc,CAAC,KAAa;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAAC,KAAU;IAC7B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,iBAAiB,CAAC;IACjD,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,2DAA2D;IACxE,UAAU,EAAE,WAAW;IACvB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAC/B,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC;CAC7F,CAAC,CAAC"}

package/lib/types/date.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/types/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAQ,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,UAAU,iCAuBrB,CAAC"}
+{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/types/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAQ,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,UAAU,iCAyBrB,CAAC"}

package/lib/types/date.js

@@ -3,8 +3,10 @@ export const DateScalar = new GraphQLScalarType({
     name: "Date",
     description: "Date custom scalar type",
     serialize(value) {
-        if (value instanceof Date) {
-            return value.toISOString(); // Convert outgoing Date to integer for JSON
+        // Stores serializing to JSON return dates as ISO strings or timestamps
+        const date = typeof value === "string" || typeof value === "number" ? new Date(value) : value;
+        if (date instanceof Date && !isNaN(date.getTime())) {
+            return date.toISOString();
         }
         throw Error("GraphQL Date Scalar serializer expected a `Date` object");
     },

package/lib/types/date.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/types/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC;IAC9C,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,yBAAyB;IACtC,SAAS,CAAC,KAAK;QACb,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,4CAA4C;QAC1E,CAAC;QACD,MAAM,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IACD,UAAU,CAAC,KAAK;QACd,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,mCAAmC;QAC7D,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,YAAY,CAAC,GAAG;QACd,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7B,4DAA4D;YAC5D,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,4CAA4C;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/types/date.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC;IAC9C,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,yBAAyB;IACtC,SAAS,CAAC,KAAK;QACb,uEAAuE;QACvE,MAAM,IAAI,GAAG,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9F,IAAI,IAAI,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,CAAC;QACD,MAAM,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC;IACD,UAAU,CAAC,KAAK;QACd,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,mCAAmC;QAC7D,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,YAAY,CAAC,GAAG;QACd,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7B,4DAA4D;YAC5D,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QACD,4CAA4C;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/graphql",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "description": "GraphQL endpoint for your Webda Application",
   "main": "lib/index.js",
   "type": "module",
@@ -18,12 +18,15 @@
     "graphql-ws": "^6.0.8",
     "json-schema": "^0.4.0",
     "ws": "^8.20.0",
-    "@webda/core": "4.0.0-beta.5",
-    "@webda/runtime": "4.0.0-beta.5",
-    "@webda/ql": "4.0.0-beta.5"
+    "@webda/core": "4.0.0-beta.7",
+    "@webda/runtime": "4.0.0-beta.7",
+    "@webda/utils": "4.0.0-beta.7",
+    "@webda/ql": "4.0.0-beta.6",
+    "@webda/workout": "4.0.0-beta.5"
   },
   "devDependencies": {
     "@types/node": "25.5.0",
+    "@vitest/coverage-v8": "^4.1.2",
     "c8": "^11.0.0",
     "glob": "^13.0.6",
     "js-beautify": "^1.15.4",
@@ -32,7 +35,9 @@
     "skott": "^0.35.8",
     "source-map-support": "^0.5.21",
     "vite": "^6.0.0",
-    "@webda/compiler": "^4.0.0-beta.5"
+    "vitest": "^4.0.0",
+    "@webda/compiler": "^4.0.0-beta.7",
+    "@webda/test": "^4.0.0-beta.6"
   },
   "webda": {
     "namespace": "Webda"
@@ -59,7 +64,7 @@
   "scripts": {
     "build": "webdac build",
     "pretest": "npm run build",
-    "test": "echo 'Tests disabled — spec files need migration from @testdeck/mocha to @webda/test'",
+    "test": "vitest run",
     "new-model": "webda init webda:model",
     "new-service": "webda init webda:service",
     "lint": "eslint",

package/webda.module.json

@@ -20,6 +20,16 @@
             "description": "Expose current user in the context with me",
             "type": "boolean"
           },
+          "exposeOperations": {
+            "default": [
+              "*"
+            ],
+            "description": "Operations exposed as GraphQL fields next to the model schema, with the operation transports' patterns:\n`\"*\"`, `\"Service.*\"`, an exact id, `\"!Id\"` to exclude; `[]` exposes no operation",
+            "items": {
+              "type": "string"
+            },
+            "type": "array"
+          },
           "globalSubscription": {
             "default": false,
             "description": "Expose a aggregation of all available subscriptions",