@voxgig/sdkgen 0.22.0 → 0.24.0

package/bin/voxgig-sdkgen

@@ -11,7 +11,7 @@ const Pkg = require('../package.json')
 const { SdkGen } = require('../dist/sdkgen.js')
 
 
-let CONSOLE = console
+let KONSOLE = console
 
 run()
 
@@ -54,6 +54,7 @@ function exit(err) {
 async function operate(options) {
   const sdkgen = new SdkGen({
     debug: options.debug,
+    dryrun: options.dryrun,
   })
 
   await sdkgen.action(options.args)
@@ -82,6 +83,11 @@ function resolveOptions() {
         short: 'v',
       },
 
+      dryrun: {
+        type: 'boolean',
+        short: 'y',
+      },
+
     }
   })
 
@@ -89,6 +95,7 @@ function resolveOptions() {
     debug: args.values.debug,
     help: !!args.values.help,
     version: !!args.values.version,
+    dryrun: !!args.values.dryrun,
     args: args.positionals,
   }
 
@@ -101,6 +108,7 @@ function validateOptions(rawOptions) {
     debug: One(String, Boolean),
     help: Boolean,
     version: Boolean,
+    dryrun: Boolean,
     args: [String]
   })
 
@@ -117,19 +125,19 @@ function validateOptions(rawOptions) {
 
 async function handleError(err) {
   const errdesc = 'SdkGenError' === err.name ? err.message : err
-  CONSOLE.log('Voxgig SDK Generation Error:', errdesc)
+  KONSOLE.log('Voxgig SDK Generation Error:', errdesc)
   exit(err)
 }
 
 
 function version() {
-  CONSOLE.log(Pkg.version)
+  KONSOLE.log(Pkg.version)
 }
 
 
 function help() {
   const s = 'TODO'
-  CONSOLE.log(s)
+  KONSOLE.log(s)
 }
 
 

package/dist/action/action.d.ts

@@ -0,0 +1,4 @@
+import type { ActionContext } from '../types';
+declare const UpdateIndex: import("jostraca").Component;
+declare function loadContent(actx: ActionContext, which: string | string[]): any;
+export { UpdateIndex, loadContent };

package/dist/action/action.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateIndex = void 0;
+exports.loadContent = loadContent;
+const node_path_1 = __importDefault(require("node:path"));
+const jostraca_1 = require("jostraca");
+const UpdateIndex = (0, jostraca_1.cmp)(function UpdateIndex(props) {
+    const names = props.names;
+    let oldcontent = props.content;
+    let newcontent = oldcontent;
+    names.map((n) => {
+        if (!oldcontent.includes(`@"${n}.jsonic"`)) {
+            newcontent += `\n@"${n}.jsonic"`;
+        }
+    });
+    (0, jostraca_1.Content)(newcontent);
+});
+exports.UpdateIndex = UpdateIndex;
+function loadContent(actx, which) {
+    which = Array.isArray(which) ? which : [which];
+    const content = {};
+    const fs = actx.fs();
+    const tree = actx.tree;
+    const modelfolder = node_path_1.default.dirname(tree.url);
+    which.map((w) => {
+        const indexfile = node_path_1.default.join(modelfolder, w, w + '-index.jsonic');
+        const indexcontent = fs.readFileSync(indexfile, 'utf8');
+        content[`${w}_index`] = indexcontent;
+    });
+    return content;
+}
+//# sourceMappingURL=action.js.map

package/dist/action/action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"action.js","sourceRoot":"","sources":["../../src/action/action.ts"],"names":[],"mappings":";;;;;;AAoDE,kCAAW;AAnDb,0DAA4B;AAE5B,uCAGiB;AAQjB,MAAM,WAAW,GAAG,IAAA,cAAG,EAAC,SAAS,WAAW,CAAC,KAAU;IACrD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAA;IAEzB,IAAI,UAAU,GAAG,KAAK,CAAC,OAAO,CAAA;IAC9B,IAAI,UAAU,GAAG,UAAU,CAAA;IAE3B,KAAK,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;QACtB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,UAAU,IAAI,OAAO,CAAC,UAAU,CAAA;QAClC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,IAAA,kBAAO,EAAC,UAAU,CAAC,CAAA;AACrB,CAAC,CAAC,CAAA;AAwBA,kCAAW;AArBb,SAAS,WAAW,CAAC,IAAmB,EAAE,KAAwB;IAChE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAE9C,MAAM,OAAO,GAAQ,EAAE,CAAA;IAEvB,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;IACpB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACtB,MAAM,WAAW,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE1C,KAAK,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;QACtB,MAAM,SAAS,GAAG,mBAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAA;QAChE,MAAM,YAAY,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACvD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,OAAO,OAAO,CAAA;AAChB,CAAC"}

package/dist/action/feature.d.ts

@@ -1,2 +1,4 @@
-declare function action_feature(args: any[], ctx: any): Promise<void>;
-export { action_feature };
+import type { ActionContext, ActionResult } from '../types';
+declare function action_feature(args: string[], actx: ActionContext): Promise<ActionResult>;
+declare function feature_add(features: string[], actx: ActionContext): Promise<ActionResult>;
+export { feature_add, action_feature, };

package/dist/action/feature.js

@@ -1,77 +1,96 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.feature_add = feature_add;
 exports.action_feature = action_feature;
+const node_path_1 = __importDefault(require("node:path"));
 const jostraca_1 = require("jostraca");
+const util_1 = require("@voxgig/util");
 const utility_1 = require("../utility");
+const action_1 = require("./action");
 const CMD_MAP = {
     add: cmd_feature_add
 };
 const BASE = 'node_modules/@voxgig/sdkgen';
-async function action_feature(args, ctx) {
+async function action_feature(args, actx) {
     const cmdname = args[1];
     const cmd = CMD_MAP[cmdname];
     if (null == cmd) {
         throw new utility_1.SdkGenError('Unknown feature cmd: ' + cmdname);
     }
-    await cmd(args, ctx);
+    return await cmd(args, actx);
+}
+async function cmd_feature_add(args, actx) {
+    const features_arg = args[2];
+    const features = 'string' === typeof features_arg ? features_arg.split(',') : features_arg;
+    return feature_add(features, actx);
 }
-async function cmd_feature_add(args, ctx) {
-    let features = args[2];
-    features = 'string' === typeof features ? features.split(',') : features;
+async function feature_add(features, actx) {
     const jostraca = (0, jostraca_1.Jostraca)();
     const opts = {
-        fs: ctx.fs,
-        folder: ctx.folder,
-        log: ctx.log.child({ cmp: 'jostraca' }),
-        meta: { model: ctx.model, tree: ctx.tree }
+        fs: actx.fs,
+        folder: actx.folder,
+        log: actx.log.child({ cmp: 'jostraca' }),
+        meta: {
+            // model: actx.model,
+            tree: actx.tree,
+            content: (0, action_1.loadContent)(actx, 'feature')
+        },
+        model: actx.model
+    };
+    opts.log.info({
+        point: 'feature-start',
+        note: (actx.opts.dryrun ? '** DRY RUN **' : '')
+    });
+    const jres = await jostraca.generate(opts, () => FeatureRoot({ features }));
+    (0, util_1.showChanges)(opts.log, 'feature-result', jres);
+    opts.log.info({
+        point: 'feature-end',
+        note: (actx.opts.dryrun ? '** DRY RUN **' : '')
+    });
+    return {
+        jres
     };
-    await jostraca.generate(opts, () => FeatureRoot({ features }));
 }
 const FeatureRoot = (0, jostraca_1.cmp)(function FeatureRoot(props) {
     const { ctx$, features } = props;
-    // TODO: model should be a top level ctx property
-    const model = ctx$.model = ctx$.meta.model;
+    const { model, log } = ctx$;
     const target = model.main.sdk.target;
     (0, jostraca_1.Project)({}, () => {
         (0, jostraca_1.each)(features, (n) => {
-            const name = n.val$;
+            const fname = n.val$;
             // TODO: validate feature is a-z0-9-_. only
+            log.info({
+                point: 'feature-build',
+                feature: fname,
+                note: fname
+            });
             (0, jostraca_1.Folder)({ name: 'model/feature' }, () => {
                 (0, jostraca_1.Copy)({
                     // TODO: these paths needs to be parameterised
-                    from: BASE + '/project/.sdk/model/feature/' + name + '.jsonic',
+                    from: BASE + '/project/.sdk/model/feature/' + fname + '.jsonic',
                     exclude: true
                 });
+                (0, jostraca_1.File)({ name: 'feature-index.jsonic' }, () => (0, action_1.UpdateIndex)({
+                    content: ctx$.meta.content.feature_index,
+                    names: features,
+                }));
             });
-            (0, jostraca_1.each)(target, (target) => (0, jostraca_1.Folder)({ name: 'tm/' + target.name + '/src/feature/' + name }, () => {
+            (0, jostraca_1.each)(target, (target) => (0, jostraca_1.Folder)({ name: 'tm/' + target.name + '/src/feature/' + fname }, () => {
+                const from = node_path_1.default.join((target.base || node_path_1.default.join(BASE, '/project/.sdk')), 'tm', target.name, '/src/feature/', fname);
                 (0, jostraca_1.Copy)({
-                    from: BASE + '/project/.sdk/tm/' + target.name + '/src/feature/' + name,
+                    // from: BASE + '/project/.sdk/tm/' + target.name + '/src/feature/' + name,
+                    from,
                     exclude: true
                 });
             }));
+            log.info({
+                point: 'feature-done', feature: fname,
+                note: fname
+            });
         });
     });
-    modifyModel({
-        features,
-        model: ctx$.meta.model,
-        tree: ctx$.meta.tree,
-        fs: ctx$.fs
-    });
 });
-async function modifyModel({ features, model, tree, fs }) {
-    // TODO: This is a kludge.
-    // Aontu should provide option for as-is AST so that can be used
-    // to find injection point more reliably
-    const path = tree.url;
-    let src = fs().readFileSync(path, 'utf8');
-    // Inject feature file references into model
-    features.sort().map((feature) => {
-        const lineRE = new RegExp(`@"feature/${feature}.jsonic"`);
-        if (!src.match(lineRE)) {
-            src = src.replace(/(main:\s+sdk:\s+feature:\s+\{\s*\}\n)/, '$1' +
-                `@"feature/${feature}.jsonic"\n`);
-        }
-    });
-    fs().writeFileSync(path, src);
-}
 //# sourceMappingURL=feature.js.map

package/dist/action/feature.js.map

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

package/dist/action/target.d.ts

@@ -1,2 +1,4 @@
-declare function action_target(args: any[], ctx: any): Promise<void>;
-export { action_target };
+import type { ActionContext, ActionResult } from '../types';
+declare function action_target(args: string[], actx: ActionContext): Promise<ActionResult>;
+declare function target_add(targets: string[], actx: ActionContext): Promise<ActionResult>;
+export { action_target, target_add, };

package/dist/action/target.js

@@ -1,87 +1,178 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.action_target = action_target;
+exports.target_add = target_add;
+const node_path_1 = __importDefault(require("node:path"));
 const jostraca_1 = require("jostraca");
+const util_1 = require("@voxgig/util");
+const struct_1 = require("@voxgig/struct");
 const utility_1 = require("../utility");
+const feature_1 = require("./feature");
+const action_1 = require("./action");
 const CMD_MAP = {
     add: cmd_target_add
 };
-async function action_target(args, ctx) {
+async function action_target(args, actx) {
     const cmdname = args[1];
     const cmd = CMD_MAP[cmdname];
     if (null == cmd) {
         throw new utility_1.SdkGenError('Unknown target cmd: ' + cmdname);
     }
-    await cmd(args, ctx);
+    return await cmd(args, actx);
+}
+async function cmd_target_add(args, actx) {
+    const targets_arg = args[2];
+    const targets = 'string' === typeof targets_arg ? targets_arg.split(',') : targets_arg;
+    return target_add(targets, actx);
 }
-async function cmd_target_add(args, ctx) {
-    let targets = args[2];
-    targets = 'string' === typeof targets ? targets.split(',') : targets;
-    const jostraca = (0, jostraca_1.Jostraca)();
+// Code API
+async function target_add(targets, actx) {
+    // const jostraca = Jostraca()
+    const jostraca = actx.jostraca;
     const opts = {
-        fs: ctx.fs,
-        folder: ctx.folder,
-        log: ctx.log.child({ cmp: 'jostraca' }),
-        meta: { model: ctx.model, tree: ctx.tree },
-        model: ctx.model
+        fs: actx.fs,
+        folder: actx.folder,
+        log: actx.log.child({ cmp: 'jostraca' }),
+        meta: {
+            // model: actx.model,
+            tree: actx.tree,
+            content: (0, action_1.loadContent)(actx, 'target')
+        },
+        model: actx.model,
+    };
+    opts.log.info({
+        point: 'target-start',
+        note: (actx.opts.dryrun ? '** DRY RUN **' : '')
+    });
+    const jres = await jostraca.generate(opts, () => TargetRoot({ targets, actx }));
+    (0, util_1.showChanges)(opts.log, 'target-result', jres);
+    const features = Object.keys(actx.model.main.sdk.feature);
+    await (0, feature_1.feature_add)(features, actx);
+    opts.log.info({
+        point: 'target-end',
+        note: (actx.opts.dryrun ? '** DRY RUN **' : '')
+    });
+    return {
+        jres
     };
-    await jostraca.generate(opts, () => TargetRoot({ targets }));
 }
 const TargetRoot = (0, jostraca_1.cmp)(function TargetRoot(props) {
     const { ctx$, targets } = props;
-    // TODO: model should be a top level ctx property
-    // ctx$.model = ctx$.meta.model
-    // console.log('MODEL')
-    // console.dir(ctx$.model, { depth: null })
-    const { model } = ctx$;
+    const { model, log } = ctx$;
+    // TODO: jostraca - make from value easier to specify 
+    // const tfolder = 'node_modules/@voxgig/sdkgen/project/.sdk'
     (0, jostraca_1.Project)({}, () => {
         (0, jostraca_1.each)(targets, (n) => {
-            // TODO: validate target is a-z0-9-_. only
-            const name = n.val$;
+            const tref = n.val$;
+            log.info({
+                point: 'target-build',
+                target: tref,
+                note: tref
+            });
+            const { tname, tfolder, torigname, base } = resolveTarget(tref, ctx$);
+            const targetNote = tname + (tname != tref ? ' ref:' + tref : '');
+            log.info({
+                point: 'target-name', name: tname, folder: tfolder,
+                target: tref,
+                tname,
+                note: tname + (tname != torigname ? 'original' + torigname : '') + ' from:' + tfolder
+            });
             (0, jostraca_1.Folder)({ name: 'model/target' }, () => {
                 (0, jostraca_1.Copy)({
-                    from: 'node_modules/@voxgig/sdkgen/project/.sdk/model/target/' + name + '.jsonic',
+                    from: tfolder + '/model/target/' + torigname + '.jsonic',
                     // exclude: true
+                    replace: {
+                        "'BASE'": "'" + base + "'"
+                    }
                 });
+                (0, jostraca_1.File)({ name: 'target-index.jsonic' }, () => (0, action_1.UpdateIndex)({
+                    content: ctx$.meta.content.target_index,
+                    // names: targets,
+                    names: [tname]
+                }));
             });
-            (0, jostraca_1.Folder)({ name: 'src/cmp/' + name }, () => {
+            (0, jostraca_1.Folder)({ name: 'src/cmp/' + tname }, () => {
                 (0, jostraca_1.Copy)({
-                    from: 'node_modules/@voxgig/sdkgen/project/.sdk/src/cmp/' + name,
+                    from: tfolder + '/src/cmp/' + torigname,
                     // exclude: true
                 });
             });
-            (0, jostraca_1.Folder)({ name: 'tm/' + name }, () => {
+            (0, jostraca_1.Folder)({ name: 'tm/' + tname }, () => {
                 (0, jostraca_1.Copy)({
-                    from: 'node_modules/@voxgig/sdkgen/project/.sdk/tm/' + name,
+                    from: tfolder + '/tm/' + torigname,
                     exclude: [/src\/feature/],
                     replace: {
-                        Name: model.const.Name,
+                        // TODO: standard replacements
+                        ProjectName: model.const.Name,
                     }
                 });
+                (0, jostraca_1.Folder)({ name: 'src/feature' }, () => {
+                    (0, jostraca_1.Copy)({ from: tfolder + '/tm/' + torigname + '/src/feature/README.md' });
+                    (0, jostraca_1.Folder)({ name: 'base' }, () => {
+                        (0, jostraca_1.Copy)({ from: tfolder + '/tm/' + torigname + '/src/feature/base' });
+                    });
+                });
+            });
+            log.info({
+                point: 'target-done', target: tref, note: targetNote
             });
         });
     });
-    modifyModel({
-        targets,
-        model: ctx$.meta.model,
-        tree: ctx$.meta.tree,
-        fs: ctx$.fs
-    });
 });
-async function modifyModel({ targets, model, tree, fs }) {
-    // TODO: This is a kludge.
-    // Aontu should provide option for as-is AST so that can be used
-    // to find injection point more reliably
-    const path = tree.url;
-    let src = fs().readFileSync(path, 'utf8');
-    // Inject target file references into model
-    targets.sort().map((target) => {
-        const lineRE = new RegExp(`@"target/${target}.jsonic"`);
-        if (!src.match(lineRE)) {
-            src = src.replace(/(main:\s+sdk:\s+target:\s+\{\s*\}\n)/, '$1' +
-                `@"target/${target}.jsonic"\n`);
+function resolveTarget(tref, ctx$) {
+    let tname = tref;
+    let torigname = tref;
+    let tfolder = 'node_modules/@voxgig/sdkgen/project/.sdk';
+    const root = ctx$.folder;
+    const fs = ctx$.fs();
+    let fulltfolder = node_path_1.default.normalize(node_path_1.default.join(root, tfolder));
+    tname = (0, struct_1.getelem)(tref.split('/'), -1);
+    let aliasref = tref;
+    torigname = (0, struct_1.getelem)(aliasref.split('/'), -1);
+    const aliasing = tref.split('~');
+    if (1 < aliasing.length) {
+        aliasref = aliasing[0];
+        tname = aliasing.slice(1).join('~');
+        torigname = (0, struct_1.getelem)(aliasref.split('/'), -1);
+    }
+    const search = [];
+    let found = false;
+    if (aliasref.includes('/')) {
+        // NOTE: the last path element of the ref is the target name, not a folder.
+        const aliasbase = node_path_1.default.dirname(aliasref);
+        if (!aliasref.startsWith('/')) {
+            fulltfolder = node_path_1.default.normalize(node_path_1.default.join(root, 'node_modules', aliasbase, '.sdk'));
+            search.push(fulltfolder);
+            found = fs.existsSync(fulltfolder);
+            if (!found) {
+                fulltfolder = node_path_1.default.normalize(node_path_1.default.join(root, aliasbase, '.sdk'));
+                search.push(fulltfolder);
+                found = fs.existsSync(fulltfolder);
+            }
         }
-    });
-    fs().writeFileSync(path, src);
+        else {
+            fulltfolder = node_path_1.default.normalize(node_path_1.default.join(aliasbase, '.sdk'));
+            search.push(fulltfolder);
+            found = fs.existsSync(fulltfolder);
+        }
+    }
+    else {
+        search.push(fulltfolder);
+        found = fs.existsSync(fulltfolder);
+    }
+    if (!found) {
+        throw new Error('Target folder not found in:\n' + search.join('\n  '));
+    }
+    const rootslash = root.endsWith('/') ? root : root + '/';
+    const out = {
+        tname,
+        tfolder: fulltfolder,
+        torigname,
+        base: fulltfolder.replace(rootslash, '')
+    };
+    return out;
 }
 //# sourceMappingURL=target.js.map

package/dist/action/target.js.map

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

package/dist/cmp/Entity.js

@@ -5,9 +5,14 @@ const jostraca_1 = require("jostraca");
 const utility_1 = require("../utility");
 const Entity = (0, jostraca_1.cmp)(function Entity(props) {
     const { target, entity, ctx$ } = props;
+    const { log } = ctx$;
     const entitySDK = ctx$.model.main.sdk.entity[entity.name];
     const Entity_sdk = (0, utility_1.requirePath)(ctx$, `./cmp/${target.name}/Entity_${target.name}`);
     Entity_sdk['Entity']({ target, entity, entitySDK });
+    log.info({
+        point: 'generate-entity', target, entity,
+        note: 'target:' + target.name + ', ' + 'entity: ' + entity.name
+    });
 });
 exports.Entity = Entity;
 //# sourceMappingURL=Entity.js.map

package/dist/cmp/Entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/cmp/Entity.ts"],"names":[],"mappings":";;;AACA,uCAEiB;AAEjB,wCAAwC;AAGxC,MAAM,MAAM,GAAG,IAAA,cAAG,EAAC,SAAS,MAAM,CAAC,KAAU;IAC3C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAEzD,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,SAAS,MAAM,CAAC,IAAI,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAClF,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;AACrD,CAAC,CAAC,CAAA;AAIA,wBAAM"}
+{"version":3,"file":"Entity.js","sourceRoot":"","sources":["../../src/cmp/Entity.ts"],"names":[],"mappings":";;;AACA,uCAEiB;AAEjB,wCAAwC;AAGxC,MAAM,MAAM,GAAG,IAAA,cAAG,EAAC,SAAS,MAAM,CAAC,KAAU;IAC3C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACtC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEpB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAEzD,MAAM,UAAU,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,SAAS,MAAM,CAAC,IAAI,WAAW,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAClF,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAA;IAEnD,GAAG,CAAC,IAAI,CAAC;QACP,KAAK,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM;QACxC,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI;KAChE,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAIA,wBAAM"}

package/dist/cmp/Feature.js

@@ -4,6 +4,7 @@ exports.Feature = void 0;
 const jostraca_1 = require("jostraca");
 const Feature = (0, jostraca_1.cmp)(function Feature(props) {
     const { target, feature, ctx$ } = props;
+    const { log } = ctx$;
     (0, jostraca_1.Folder)({ name: 'src/feature/' + feature.name }, () => {
         // TODO: Copy should just warn if from not found
         (0, jostraca_1.Copy)({
@@ -14,6 +15,10 @@ const Feature = (0, jostraca_1.cmp)(function Feature(props) {
             }
         });
     });
+    log.info({
+        point: 'generate-feature', target, feature,
+        note: 'target:' + target.name + ', ' + 'feature: ' + feature.name
+    });
 });
 exports.Feature = Feature;
 //# sourceMappingURL=Feature.js.map

package/dist/cmp/Feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"Feature.js","sourceRoot":"","sources":["../../src/cmp/Feature.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAK5C,MAAM,OAAO,GAAG,IAAA,cAAG,EAAC,SAAS,OAAO,CAAC,KAAU;IAC7C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAEvC,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;QACnD,gDAAgD;QAChD,IAAA,eAAI,EAAC;YACH,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC,IAAI,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI;YAC1D,OAAO,EAAE;gBACP,eAAe,EAAE,OAAO,CAAC,OAAO;gBAChC,YAAY,EAAE,OAAO,CAAC,IAAI;aAC3B;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;AAIA,0BAAO"}
+{"version":3,"file":"Feature.js","sourceRoot":"","sources":["../../src/cmp/Feature.ts"],"names":[],"mappings":";;;AACA,uCAA4C;AAE5C,MAAM,OAAO,GAAG,IAAA,cAAG,EAAC,SAAS,OAAO,CAAC,KAAU;IAC7C,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IACvC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEpB,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE;QACnD,gDAAgD;QAChD,IAAA,eAAI,EAAC;YACH,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC,IAAI,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI;YAC1D,OAAO,EAAE;gBACP,eAAe,EAAE,OAAO,CAAC,OAAO;gBAChC,YAAY,EAAE,OAAO,CAAC,IAAI;aAC3B;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,IAAI,CAAC;QACP,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,OAAO;QAC1C,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI;KAClE,CAAC,CAAA;AAEJ,CAAC,CAAC,CAAA;AAIA,0BAAO"}

package/dist/cmp/Main.js

@@ -5,8 +5,10 @@ const jostraca_1 = require("jostraca");
 const utility_1 = require("../utility");
 const Main = (0, jostraca_1.cmp)(function Main(props) {
     const { target, ctx$ } = props;
-    const { model, stdrep } = ctx$;
+    const { model, stdrep, log } = ctx$;
     (0, jostraca_1.Copy)({
+        // This folder is relative to the .sdk folder in the project, as that is where
+        // the sdk is generated from.
         from: 'tm/' + target.name,
         replace: {
             ...stdrep,
@@ -14,6 +16,7 @@ const Main = (0, jostraca_1.cmp)(function Main(props) {
     });
     const Main_sdk = (0, utility_1.requirePath)(ctx$, `cmp/${target.name}/Main_${target.name}`);
     Main_sdk['Main']({ model, target, stdrep });
+    log.info({ point: 'generate-main', target, note: 'target:' + target.name });
 });
 exports.Main = Main;
 //# sourceMappingURL=Main.js.map

package/dist/cmp/Main.js.map

@@ -1 +1 @@
-{"version":3,"file":"Main.js","sourceRoot":"","sources":["../../src/cmp/Main.ts"],"names":[],"mappings":";;;AACA,uCAA2C;AAE3C,wCAAwC;AAGxC,MAAM,IAAI,GAAG,IAAA,cAAG,EAAC,SAAS,IAAI,CAAC,KAAU;IACvC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAC9B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAE9B,IAAA,eAAI,EAAC;QACH,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC,IAAI;QACzB,OAAO,EAAE;YACP,GAAG,MAAM;SACV;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,OAAO,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAE5E,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAE7C,CAAC,CAAC,CAAA;AAIA,oBAAI"}
+{"version":3,"file":"Main.js","sourceRoot":"","sources":["../../src/cmp/Main.ts"],"names":[],"mappings":";;;AACA,uCAA2C;AAE3C,wCAAwC;AAGxC,MAAM,IAAI,GAAG,IAAA,cAAG,EAAC,SAAS,IAAI,CAAC,KAAU;IACvC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;IAC9B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;IAEnC,IAAA,eAAI,EAAC;QACH,8EAA8E;QAC9E,6BAA6B;QAC7B,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC,IAAI;QACzB,OAAO,EAAE;YACP,GAAG,MAAM;SACV;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,IAAA,qBAAW,EAAC,IAAI,EAAE,OAAO,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IAE5E,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAE3C,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;AAC7E,CAAC,CAAC,CAAA;AAIA,oBAAI"}

package/dist/cmp/Top.d.ts

@@ -0,0 +1,2 @@
+declare const Top: import("jostraca").Component;
+export { Top };