nesoi 3.3.12 → 3.3.14

package/{build/lib → lib}/compiler/elements/bucket.element.js

@@ -48,7 +48,7 @@ class BucketElement extends element_1.Element {
         const bucket = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema, {
             model: () => 'any', // = this.buildModelType(),
             graph: () => this.buildGraphType(),
-            views: () => this.buildViewsType()
+            views: () => this.buildViewsType(model)
         });
         const modelpath = this.buildModelpath();
         const querypath = this.buildQuerypath();
@@ -190,14 +190,14 @@ class BucketElement extends element_1.Element {
             links
         };
     }
-    buildViewsType() {
+    buildViewsType(model) {
         const views = {};
         Object.entries(this.schema.views).forEach(([key, view]) => {
-            views[key] = this.buildViewType(view.fields, key);
+            views[key] = this.buildViewType(model, view.fields, key);
         });
         return views;
     }
-    buildViewType(schema, name) {
+    buildViewType(model, schema, name) {
         if (!schema) {
             return;
         }
@@ -231,13 +231,18 @@ class BucketElement extends element_1.Element {
                     data[key] = field['#data'];
                 }
                 else if (field.scope === 'view' || field.scope === 'group') {
-                    const children = this.buildViewType(field.children, field.name);
+                    const children = this.buildViewType(model, field.children, field.name);
                     data[key] = children['#data'];
                 }
             }
             return data;
         };
-        const data = buildFields(schema);
+        const data = {};
+        if ('__raw' in schema) {
+            Object.assign(data, model);
+        }
+        const viewData = buildFields(schema);
+        Object.assign(data, viewData);
         return {
             $t: dump_helpers_1.DumpHelpers.dumpValueToType('bucket.view'),
             fields: 'any',

package/{build/lib → lib}/compiler/stages/3_extract_ts_stage.js

@@ -26,7 +26,8 @@ class ExtractTSStage {
             buckets: {},
             messages: {},
             jobs: {},
-            machines: {}
+            machines: {},
+            resources: {}
         };
         nodes.forEach(node => {
             if (node.progressive) {
@@ -49,6 +50,7 @@ class ExtractTSStage {
             Object.assign(organized.messages, nodeOrganized.messages);
             Object.assign(organized.jobs, nodeOrganized.jobs);
             Object.assign(organized.machines, nodeOrganized.machines);
+            Object.assign(organized.resources, nodeOrganized.resources);
         });
         nodes.forEach(node => {
             if (node.progressive) {
@@ -70,6 +72,9 @@ class ExtractTSStage {
             else if (node.builder.$b === 'machine') {
                 e = organized.machines[node.tag.full];
             }
+            else if (node.builder.$b === 'resource') {
+                e = organized.resources[node.tag.full];
+            }
             node.bridge = {
                 imports,
                 extract: e,

package/{build/lib → lib}/compiler/typescript/bridge/inject.d.ts

@@ -5,6 +5,7 @@ export declare class TSBridgeInject {
     private static bucket;
     private static message;
     private static job;
+    private static resource;
     private static machine;
     private static machineTransitions;
 }

package/{build/lib → lib}/compiler/typescript/bridge/inject.js

@@ -34,6 +34,12 @@ class TSBridgeInject {
                 return;
             this.machine(compiler, extract, node);
         }
+        if (schema.$t === 'resource') {
+            const extract = node.bridge?.extract;
+            if (!extract)
+                return;
+            this.resource(compiler, extract, node);
+        }
     }
     static bucket(compiler, extract, node) {
         const { tsCompiler } = compiler;
@@ -163,6 +169,18 @@ class TSBridgeInject {
             schema['#output'] = undefined; // Will be recalculated by element based on output
         }
     }
+    static resource(compiler, extract, node) {
+        const { tsCompiler } = compiler;
+        const schema = node.schema;
+        if (extract.authResolver) {
+            schema.auth.forEach((a, i) => {
+                a.resolver = {
+                    __fn: tsCompiler.getFnText(extract.authResolver[i]),
+                    __fn_type: '(...args: any[]) => any', // TODO: evaluate
+                };
+            });
+        }
+    }
     static machine(compiler, extract, node) {
         const { tsCompiler } = compiler;
         const schema = node.schema;

package/{build/lib → lib}/compiler/typescript/bridge/organize.d.ts

@@ -27,6 +27,9 @@ export type JobFnExtract = {
     after?: tsFn;
     outputRaw?: string;
 };
+export type ResourceFnExtract = {
+    authResolver?: tsFn[];
+};
 export type MachineFnExtract = {
     states: {
         [name: string]: MachineStateFnExtract;
@@ -45,6 +48,7 @@ export type OrganizedExtract = {
     messages: Record<string, MessageFnExtract>;
     jobs: Record<string, JobFnExtract>;
     machines: Record<string, MachineFnExtract>;
+    resources: Record<string, ResourceFnExtract>;
 };
 export declare class TSBridgeOrganize {
     static functions(types?: {

package/{build/lib → lib}/compiler/typescript/bridge/organize.js

@@ -8,7 +8,8 @@ class TSBridgeOrganize {
             buckets: {},
             messages: {},
             jobs: {},
-            machines: {}
+            machines: {},
+            resources: {}
         };
         functions.forEach(fn => {
             const match = fn.path.match(/(\w+::\w+:.+?)▹(.+)/);
@@ -180,6 +181,12 @@ class TSBridgeOrganize {
             this.resourceJob(organized, jobTag, path, node);
             return;
         }
+        const authResolver = path.match(/auth▹.+▹1$/);
+        if (authResolver) {
+            organized.resources[tag] ??= {};
+            organized.resources[tag].authResolver ??= [];
+            organized.resources[tag].authResolver.push(node);
+        }
     }
     static machine(organized, tag, path, node) {
         this.inlineMessage(organized, tag, path, node);

package/package.json

@@ -1,62 +1,21 @@
 {
-  "name": "nesoi",
-  "version": "3.3.12",
-  "description": "Declarative framework for data-driven applications",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/nesoi-org/nesoi.git"
-  },
-  "keywords": [
-    "nesoi"
-  ],
-  "author": "Hugo Aboud",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/nesoi-org/nesoi/issues"
-  },
-  "homepage": "https://github.com/nesoi-org/nesoi#readme",
-  "files": [
-    "build/**/*",
-    "scripts/**/*",
-    "index.d.ts"
-  ],
-  "scripts": {
-    "build": "tspc -p tsconfig.build.json",
-    "build:browser": "tspc -p tsconfig.build_browser.json",
-    "bundle": "npx tsx scripts/bundle",
-    "bundle:browser": "npx tsx scripts/bundle_browser",
-    "lint": "eslint .",
-    "test": "jest test --maxWorkers=1 --watch",
-    "test:types": "tsd",
-    "mk:jsdoc": "jsdoc -c jsdoc.json"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.11.0",
-    "@types/jest": "29.5.12",
-    "@types/node": "24.6.2",
-    "@types/web": "0.0.271",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
-    "@typescript-eslint/parser": "^8.6.0",
-    "better-docs": "^2.7.3",
-    "eslint": "^8",
-    "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
-    "globals": "^15.9.0",
-    "jest": "29.7.0",
-    "jsdoc": "^4.0.4",
-    "module-alias": "2.2.3",
-    "ts-jest": "29.1.2",
-    "ts-patch": "3.3.0",
-    "tsd": "^0.31.2",
-    "typescript": "5.9.3",
-    "typescript-eslint": "^8.6.0",
-    "typescript-transform-paths": "3.5.3"
-  },
-  "_moduleAliases": {
-    "~": "build/src",
-    "nesoi/tools": "build/tools"
-  },
-  "peerDependencies": {
-    "chokidar": "^4.0.3"
-  }
-}
+    "name": "nesoi",
+    "version": "3.3.14",
+    "description": "Declarative framework for data-driven applications",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/nesoi-org/nesoi.git"
+    },
+    "keywords": [
+        "nesoi"
+    ],
+    "author": "Hugo Aboud",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/nesoi-org/nesoi/issues"
+    },
+    "homepage": "https://github.com/nesoi-org/nesoi#readme",
+    "peerDependencies": {
+        "@types/node": ">=20"
+    }
+}