jostraca 0.18.0 → 0.20.0

package/dist/util/point.js

@@ -0,0 +1,205 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrintPoint = exports.FuncPoint = exports.ParallelPoint = exports.SerialPoint = exports.RootPoint = exports.Point = void 0;
+exports.buildPoints = buildPoints;
+exports.makeFuncDef = makeFuncDef;
+const gubu_1 = require("gubu");
+const basic_1 = require("./basic");
+class Point {
+    constructor(id, name) {
+        this.id = id;
+        this.name = name;
+    }
+    async runner(pctx) {
+        const suffix = (null == this.name || '' === this.name) ? '' : ':' + this.name;
+        this.logger(pctx, {
+            note: this.constructor.name + ':before:' + this.id + suffix, args: this.args
+        });
+        if (pctx.async) {
+            await this.run(pctx);
+        }
+        else {
+            this.run(pctx);
+        }
+        this.logger(pctx, {
+            note: this.constructor.name + ':after:' + this.id + suffix, args: this.args
+        });
+    }
+    logger(pctx, entry) {
+        entry.note = null == entry.note ? 'none' : entry.note;
+        entry.when = pctx.sys().now();
+        entry.depth = pctx.depth;
+        if (undefined === entry.args) {
+            delete entry.args;
+        }
+        pctx.log.push(entry);
+    }
+}
+exports.Point = Point;
+class SerialPoint extends Point {
+    constructor(id) {
+        super(id);
+        this.points = [];
+    }
+    add(p) {
+        this.points.push(p);
+    }
+    async run(pctx) {
+        let childctx = { ...pctx };
+        childctx.depth++;
+        for (let p of this.points) {
+            if (pctx.async) {
+                await p.runner(childctx);
+            }
+            else {
+                p.runner(childctx);
+            }
+        }
+    }
+}
+exports.SerialPoint = SerialPoint;
+class RootPoint extends SerialPoint {
+    constructor(id) {
+        super(id);
+        this.points = [];
+    }
+    direct(data, sys) {
+        const pctx = this.makePointCtx(false, data, sys);
+        this.runner(pctx);
+        return pctx;
+    }
+    async start(data, sys) {
+        const pctx = this.makePointCtx(true, data, sys);
+        await this.runner(pctx);
+        return pctx;
+    }
+    makePointCtx(async, data, sys) {
+        const pctx = {
+            async,
+            log: [],
+            data: data || {},
+            depth: 0,
+            sys: sys || (() => ({
+                now: () => Date.now(),
+                print: (...s) => {
+                    if (null != s[0] && 'string' === typeof s[0]) {
+                        console.dir(s[0], s[1] || { depth: null });
+                    }
+                    else {
+                        console.log(...s);
+                    }
+                }
+            }))
+        };
+        return pctx;
+    }
+}
+exports.RootPoint = RootPoint;
+class ParallelPoint extends Point {
+    constructor(id) {
+        super(id);
+        this.points = [];
+    }
+    add(p) {
+        this.points.push(p);
+    }
+    async run(pctx) {
+        let childctx = { ...pctx };
+        childctx.depth++;
+        await Promise.all(this.points.map(p => p.runner(childctx)));
+    }
+}
+exports.ParallelPoint = ParallelPoint;
+class FuncPoint extends Point {
+    constructor(id, func) {
+        super(id, func.name);
+        this.func = func;
+    }
+    async run(pctx) {
+        if (pctx.async) {
+            await this.func(pctx);
+        }
+        else {
+            this.func(pctx);
+        }
+    }
+}
+exports.FuncPoint = FuncPoint;
+class PrintPoint extends Point {
+    constructor(id, path) {
+        super(id);
+        this.path = path;
+    }
+    async run(pctx) {
+        let print = pctx.sys().print;
+        let d = pctx.data;
+        if (null != this.path) {
+            d = (0, basic_1.getx)(d, this.path);
+        }
+        if (null != d && 'object' === typeof d) {
+            print('POINTCTX:');
+            print(d);
+        }
+        else {
+            print('POINTCTX: ' + d);
+        }
+    }
+}
+exports.PrintPoint = PrintPoint;
+const PointDefShape = (0, gubu_1.Gubu)({
+    k: (0, gubu_1.Skip)(String),
+    n: (0, gubu_1.Skip)(String),
+    p: (0, gubu_1.Skip)([]),
+    a: (0, gubu_1.Any)(),
+    m: {}
+});
+function buildPoints(pdef, pm, id) {
+    let idi = 0;
+    id = id || (() => (++idi) + '');
+    let p = undefined;
+    // TODO: fix point kind resolution to be more extensible
+    pdef = PointDefShape(pdef);
+    let isSerial = 'Serial' === pdef.k || Array.isArray(pdef.p);
+    const mp = pm[pdef.k];
+    if (null != mp) {
+        p = mp(id, pdef);
+    }
+    else if (null == pdef.k || 'Root' === pdef.k) {
+        const rp = new RootPoint(id());
+        let cp = pdef.p;
+        for (let c of cp) {
+            rp.add(buildPoints(c, pm, id));
+        }
+        p = rp;
+        isSerial = false;
+    }
+    else if ('Parallel' === pdef.k) {
+        const sp = new ParallelPoint(id());
+        let cp = pdef.p;
+        for (let c of cp) {
+            sp.add(buildPoints(c, pm, id));
+        }
+        p = sp;
+        isSerial = false;
+    }
+    if (isSerial) {
+        const sp = (p || new SerialPoint(id()));
+        let cp = pdef.p;
+        for (let c of cp) {
+            sp.add(buildPoints(c, pm, id));
+        }
+        p = sp;
+    }
+    if (null == p) {
+        throw new Error('Unknown point kind: ' + JSON.stringify(pdef));
+    }
+    return p;
+}
+function makeFuncDef(fd) {
+    return (id, pdef) => {
+        const fp = new FuncPoint(id(), fd(pdef));
+        fp.args = pdef.a;
+        return fp;
+    };
+}
+//# sourceMappingURL=point.js.map

package/dist/util/point.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"point.js","sourceRoot":"","sources":["../../src/util/point.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jostraca",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "main": "dist/jostraca.js",
   "type": "commonjs",
   "types": "dist/jostraca.d.ts",
@@ -16,8 +16,8 @@
     "url": "git://github.com/jostraca/jostraca.git"
   },
   "scripts": {
-    "test": "node --enable-source-maps --test dist-test",
-    "test-some": "node --enable-source-maps --test-name-pattern=\"$npm_config_pattern\" --test dist-test",
+    "test": "node --enable-source-maps --test dist-test/**/*.test.js",
+    "test-some": "node --enable-source-maps --test-name-pattern=\"$npm_config_pattern\" --test dist-test/**/*.test.js",
     "watch": "tsc --build src test -w",
     "build": "tsc --build src test",
     "clean": "rm -rf dist dist-test node_modules yarn.lock package-lock.json",
@@ -35,9 +35,9 @@
   ],
   "devDependencies": {
     "@hapi/code": "^9.0.3",
-    "@types/node": "22.15.17",
-    "esbuild": "^0.25.4",
-    "oxc-parser": "^0.68.1",
+    "@types/node": "24.0.7",
+    "esbuild": "^0.25.5",
+    "oxc-parser": "^0.75.0",
     "typescript": "^5.8.3"
   },
   "peerDependencies": {
@@ -45,7 +45,7 @@
     "memfs": ">=4"
   },
   "dependencies": {
-    "diff": "^7.0.0",
+    "diff": "^8.0.2",
     "gubu": "^9.0.0",
     "node-diff3": "^3.1.2"
   }

package/src/cmp/Content.ts

@@ -13,7 +13,12 @@ const Content = cmp(function Content(props: any, children: any) {
     null != props.src ? props.src :
       'string' === typeof children ? children : ''
 
-  src = template(src, props.ctx$.model, {
+  let model = {
+    ...props.ctx$.model,
+    ...(props.extra || {})
+  }
+
+  src = template(src, model, {
     replace: props.replace
   })
 

package/src/cmp/Fragment.ts

@@ -16,6 +16,7 @@ const FragmentShape = Gubu({
   exclude: Optional(One(Boolean, [String])) as unknown as boolean | string[],
   indent: Optional(One(Empty(String), Number)),
   replace: {} as any,
+  eject: Optional([One(String, RegExp)]) as unknown as any[]
 }, { name: 'Fragment' })
 
 
@@ -74,6 +75,7 @@ const Fragment = cmp(function Fragment(props: FragmentProps, children: any) {
 
   template(src, model, {
     replace,
+    eject: props?.eject,
     handle: (s?: string) => null == s ? null : Content(s)
   })
 })

package/src/jostraca.ts

@@ -11,7 +11,7 @@ import { AsyncLocalStorage } from 'node:async_hooks'
 
 import { util as JsonicUtil } from 'jsonic'
 
-import { Gubu, Skip } from 'gubu'
+import { Gubu, Skip, One } from 'gubu'
 
 import { memfs as MemFs } from 'memfs'
 
@@ -30,7 +30,7 @@ import {
 
 import {
   each,
-  select,
+  // select,
   get,
   getx,
   camelify,
@@ -49,6 +49,8 @@ import {
 } from './util/basic'
 
 
+import * as PointUtil from './util/point'
+
 // TODO: the actual signatures
 const deep: (...args: any[]) => any = JsonicUtil.deep
 const omap: (...args: any[]) => any = JsonicUtil.omap
@@ -91,6 +93,21 @@ const DEFAULT_LOGGER = {
 
 const OptionsShape = Gubu({
   folder: Skip(String), // Base output folder for generated files. Default: `.`.
+
+  // TODO: implement
+  name: {
+    file: {
+      prefix: Skip(String), // Prefix for all output file names
+      suffix: Skip(String), // Suffix for all output file names
+    },
+    folder: {
+      prefix: Skip(String), // Prefix for all output folder names
+      suffix: Skip(String), // Prefix for all output folder names
+    },
+    // Files excluded from prefixing and suffixing
+    exclude: Skip(One(String, RegExp, [One(String, RegExp)]))
+  },
+
   meta: {} as any, // Provide meta data to the generation process. Default: `{}`
 
   fs: Skip(Function) as any, // File system API. Default: `node:fs`.
@@ -242,7 +259,7 @@ function Jostraca(gopts_in?: JostracaOptions | {}) {
       }
 
       if (memfs) {
-        res.vol = memfs.vol
+        res.vol = () => memfs.vol
       }
 
       return res
@@ -366,8 +383,6 @@ function cmp(component: Function): Component {
       node.path.push(props.name)
     }
 
-    // ctx$.props = () => props
-
     let out = component(props, children)
 
     ctx$.children = siblings
@@ -385,6 +400,7 @@ function cmp(component: Function): Component {
 // }
 
 
+
 export type {
   JostracaOptions,
   Component,
@@ -399,7 +415,7 @@ export {
   cmp,
 
   each,
-  select,
+  // select,
   get,
   getx,
   camelify,
@@ -429,6 +445,8 @@ export {
   Line,
   Slot,
   List,
+
+  PointUtil,
 }
 
 

package/src/types.ts

@@ -44,7 +44,7 @@ type JostracaResult = {
     conflicted: string[],
     unchanged: string[],
   }
-  vol?: any
+  vol?: () => any
 }
 
 

package/src/util/basic.ts

@@ -107,12 +107,12 @@ function each(
 }
 
 
-
+/*
 function select(key: any, map: Record<string, Function>) {
   const fn = map && map[key]
   return fn ? fn() : undefined
 }
-
+*/
 
 
 function getx(root: any, path: string | string[]): any {
@@ -350,12 +350,41 @@ function template(
     ref?: string,
     insert?: RegExp,
     replace?: Record<string, any>,
+    eject?: any[]
     handle?: (s?: string) => void
   },
 ) {
 
   src = null == src ? '' : '' + src
   model = null == model ? {} : model
+
+  let eject = spec?.eject
+  if (null != eject) {
+    const ejectStart: RegExp | null = null == eject[0] ? null :
+      eject[0] instanceof RegExp ? eject[0] :
+        new RegExp('[ \t]*' + escre('' + eject[0]) + '[ \t]*\\n?')
+    const ejectEnd: RegExp | null = null == eject[1] ? null :
+      eject[1] instanceof RegExp ? eject[1] :
+        new RegExp('[ \t]*' + escre('' + eject[1]) + '[ \t]*\\n?')
+
+    if (null != ejectStart && null != ejectEnd) {
+      let startIndex = 0
+      let endIndex = src.length
+
+      const startMatch = src.match(ejectStart)
+      if (startMatch) {
+        startIndex = (startMatch as any).index + startMatch[0].length
+      }
+
+      const endMatch = src.match(ejectEnd)
+      if (endMatch) {
+        endIndex = (endMatch as any).index
+      }
+
+      src = src.substring(startIndex, endIndex)
+    }
+  }
+
   let open = null == spec?.open ? '\\$\\$' : spec.open
   let close = null == spec?.close ? '\\$\\$' : spec.close
   let ref = null == spec?.ref ? '[^$]+' : spec.ref
@@ -638,7 +667,7 @@ export {
   kebabify,
   names,
   partify,
-  select,
+  // select,
   snakify,
   template,
   vmap,