@ibgib/core-gib 0.0.8 → 0.0.11

package/src/witness/app/app-base-v1.mts

@@ -13,12 +13,15 @@ import { CommentIbGib_V1 } from '../../common/comment/comment-types.mjs';
 import { PicIbGib_V1 } from '../../common/pic/pic-types.mjs';
 import { ErrorIbGib_V1 } from '../../common/error/error-types.mjs';
 import { validateCommonAppData } from './app-helper.mjs';
-import { argy_, isArg, resulty_ } from '../witness-helper.mjs';
+import { argy_, isArg, isCommand, resulty_ } from '../witness-helper.mjs';
 import { IbGibLocalSpaceService_AllPowerful } from '../../core-types.mjs';
 import { pretty } from '@ibgib/helper-gib';
 import { GLOBAL_LOG_A_LOT } from '../../core-constants.mjs';
 import { errorIbGib } from '../../common/error/error-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib';
+import { isComment } from '../../common/comment/comment-helper.mjs';
+import { isPic } from '../../common/pic/pic-helper.mjs';
+import { WitnessWithContextBase_V1 } from '../witness-with-context/witness-with-context-base-v1.mjs';
 
 const logalot = GLOBAL_LOG_A_LOT || false;
 
@@ -44,7 +47,7 @@ export abstract class AppBase_V1<
     TData extends AppData_V1 = AppData_V1,
     TRel8ns extends AppRel8ns_V1 = AppRel8ns_V1,
 >
-    extends WitnessBase_V1<
+    extends WitnessWithContextBase_V1<
         TOptionsData, TOptionsRel8ns, TOptionsIbGib,
         TResultData, TResultRel8ns, TResultIbGib,
         TData, TRel8ns>
@@ -54,18 +57,6 @@ export abstract class AppBase_V1<
      * Log context for convenience with logging. (Ignore if you don't want to use this.)
      */
     protected lc: string = `[${AppBase_V1.name}]`;
-    // protected lc: string = `[${AppBase_V1.name}]`;
-
-    // getAppIb(classname: string): string {
-    //     const lc = `${this.lc}[${this.getAppIb.name}]`;
-    //     if (!classname) {
-    //         classname = this.lc?.replace('[','').replace(']','') || AppBase_V1.name+'_descendant';
-    //         console.warn(`${lc} classname is falsy. Using ${classname}.`);
-    //     }
-    //     const name = this.data?.name || IBGIB_SPACE_NAME_DEFAULT;
-    //     const id = this.data?.uuid || undefined;
-    //     return `witness space ${classname} ${name} ${id}`;
-    // }
 
     /**
      * Reference to the local ibgibs service, which is one way at getting at the
@@ -90,22 +81,12 @@ export abstract class AppBase_V1<
         try {
             if (logalot) { console.log(`${lc} starting...`); }
 
-            if (this.ibgibsSvc) {
-                // check for newer version of self locally before executing
-                const appAddr = getIbGibAddr({ ibGib: this });
-                const latestAddr = await this.ibgibsSvc.getLatestAddr({ ibGib: this });
-                if (latestAddr && latestAddr !== appAddr) {
-                    // app has a newer ibgib in its timeline
-                    let resGet = await this.ibgibsSvc.get({ addr: latestAddr });
-                    if (!resGet || !resGet?.success || (resGet?.ibGibs ?? []).length === 0) {
-                        throw new Error(`could not get newer app ibgib (E: 15fa346c8ac17edb96e4b0870104c122)`);
-                    }
-                    await this.loadIbGibDto(resGet.ibGibs![0] as IbGib_V1<TData, TRel8ns>);
-                    const validationErrors = await this.validateThis();
-                    if (validationErrors?.length > 0) { throw new Error(`validationErrors when loading newer version: ${pretty(validationErrors)} (E: 0d9f0684a1ff6af44e20a57130e3ac22)`); }
-                }
-            }
-            return this.routeAndDoArg({ arg });
+            await this.loadNewerSelfIfAvailable();
+
+            let result = await this.routeAndDoArg({ arg });
+            if (!result) { result = await this.doDefault({ ibGib: arg }); }
+            if (!result) { console.warn(`${lc} result falsy...Could not produce result? Was doDefault implemented in concrete class? (W: 15e70486bc33922f9388961bab815223)`); }
+            return result;
         } catch (error) {
             console.error(`${lc} ${error.message}`);
             throw error;
@@ -138,11 +119,16 @@ export abstract class AppBase_V1<
         const lc = `${this.lc}[${this.routeAndDoArg.name}]`;
         try {
             if (logalot) { console.log(`${lc} starting...`); }
-            if (isArg({ ibGib: arg as IbGib_V1 })) {
-                if ((arg.data as any).cmd) {
+            const ibGib = arg as IbGib_V1;
+            if (isArg({ ibGib })) {
+                if (isCommand({ ibGib })) {
                     return this.doCmdArg({ arg: arg as AppCmdIbGib<IbGib_V1, AppCmdData, AppCmdRel8ns> });
+                } else if (isComment({ ibGib })) {
+                    return this.doComment({ ibGib: ibGib as CommentIbGib_V1 });
+                } else if (isPic({ ibGib })) {
+                    return this.doPic({ ibGib: ibGib as PicIbGib_V1 });
                 } else {
-                    return this.doDefault({ ibGib: arg });
+                    return undefined;
                 }
             }
         } catch (error) {
@@ -309,138 +295,6 @@ export abstract class AppBase_V1<
 
     // #endregion other stubbed do functions (doPic, doComment, doDefault)
 
-    // /**
-    //  * By default, this...
-    //  *
-    //  * * performs the raw {@link rel8} transform to the given `ibGib`.
-    //  * * persists the new ibgib's transform result in the given space.
-    //  * * registers the newer version of this app ibgib with the ibgibs svc.
-    //  *
-    //  * @see {@link ibGibs}
-    //  * @see {@link rel8nName}
-    //  * @see {@link ibgibsSvc}
-    //  * @see {@link space}
-    //  *
-    //  * ## notes
-    //  *
-    //  * * If there is no given `space`, then we will use the `ibgibsSvc` to get
-    //  *   the local user space. If none, then we skip persistence.
-    //  * * If there is no `ibgibsSvc`, we won't register the new ibgibs locally.
-    //  */
-    // protected async rel8To({
-    //     ibGibs,
-    //     rel8nName,
-    //     ibgibsSvc,
-    //     space,
-    // }: {
-    //     /**
-    //      * The ibgib to which we are relating.
-    //      */
-    //     ibGibs: IbGib_V1[],
-    //     /**
-    //      * If given, will use this as the rel8n name when performing the `rel8`
-    //      * transform.
-    //      *
-    //      * If not given, will use the `app.data`'s {@link AppData_V1.defaultRel8nName} value.
-    //      */
-    //     rel8nName?: string,
-    //     /**
-    //      * If provided, will register the newly created ibgib.
-    //      */
-    //     ibgibsSvc?: IbgibsService,
-    //     /**
-    //      * If given (which atow is most likely the case), then the {@link TransformResult} will
-    //      * be persisted in this `space`.
-    //      */
-    //     space?: IbGibSpaceAny,
-    // }): Promise<void> {
-    //     const lc = `${this.lc}[${this.rel8To.name}]`;
-    //     try {
-    //         if (logalot) { console.log(`${lc} starting...`); }
-
-    //         // #region initialize, validate args and this
-
-    //         if ((ibGibs ?? []).length === 0) { throw new Error(`ibGibs required (E: 2fd13de0f025b170885bede4d7a50922)`); }
-
-    //         rel8nName = rel8nName || this.data?.defaultRel8nName;
-    //         if (!rel8nName) { throw new Error(`rel8nName required either as an arg or in this.data.defaultRel8nName (E: 43ab8ae63694a2a82cd8a70ed6b6b522)`); }
-
-    //         const thisValidationErrors = await this.validateThis();
-    //         if (thisValidationErrors?.length > 0) { throw new Error(`this is an invalid ibGib. thisValidationErrors: ${thisValidationErrors.join('|')} (E: 8f08716866cd13bf254222ee9e6a6722)`); }
-
-    //         if (!ibgibsSvc) {
-    //             if (this.ibgibsSvc) {
-    //                 if (logalot) { console.log(`${lc} ibgibsSvc arg falsy, but we have a reference on this object, which we will use. (I: ee0d39a47ee8aee8ffd797721fea4322)`); }
-    //                 ibgibsSvc = this.ibgibsSvc;
-    //             }
-    //         }
-
-    //         if (!space) {
-    //             if (ibgibsSvc) {
-    //                 if (logalot) { console.log(`${lc} space arg falsy, but ibgibsSvc truthy, so we'll use ibgibsSvc's local user space for persistence. (I: 37a4b4c1406556cb23831671755b0d22)`); }
-    //                 space = await ibgibsSvc.getLocalUserSpace({ lock: true });
-    //             }
-    //         }
-
-    //         // #endregion initialize, validate args and this
-
-
-
-    //         // we want to rel8 only to the ibGibs whose timelines we're not
-    //         // already related to. So we look to see if we already have the tjpGib
-    //         // per our rel8nName.
-    //         const alreadyRel8dAddrs = this.rel8ns[rel8nName] ?? [];
-    //         const alreadyRel8dTjpGibs = alreadyRel8dAddrs.map(x => getGibInfo({ ibGibAddr: x }).tjpGib);
-    //         const ibGibsNotYetRel8dByTjp = ibGibs.filter(x => {
-    //             const tjpGib = getGibInfo({ ibGibAddr: h.getIbGibAddr({ ibGib: x }) }).tjpGib;
-    //             return !alreadyRel8dTjpGibs.includes(tjpGib);
-    //         });
-
-    //         if (ibGibsNotYetRel8dByTjp.length === 0) {
-    //             if (logalot) { console.log(`${lc} already rel8d to all incoming ibGib(s) via tjp. (I: 5e9d94a98ba262f146c0c0b765157922)`); }
-    //             return; /* <<<< returns early */
-    //         }
-
-    //         // perform the raw ibgib rel8 transform
-    //         const addrs = ibGibsNotYetRel8dByTjp.map(x => h.getIbGibAddr({ ibGib: x }));
-    //         const resNewApp = await V1.rel8({
-    //             src: this.toIbGibDto(),
-    //             rel8nsToAddByAddr: { [rel8nName]: addrs },
-    //             linkedRel8ns: ["past", "ancestor"], // we only want the most recent key address
-    //             dna: true,
-    //             nCounter: true,
-    //         });
-    //         const newAppIbGib = <IbGib_V1<TData, TRel8ns>>resNewApp.newIbGib;
-    //         const newAppValidationErrors =
-    //             await validateIbGibIntrinsically({ ibGib: newAppIbGib });
-    //         if (newAppValidationErrors?.length > 0) { throw new Error(`new app would have validation errors. aborting. newAppValidationErrors: ${newAppValidationErrors.join('|')} (E: eb816a27156c246c121ef55e37d59322)`); }
-
-    //         // if space is given, perform the persistence
-    //         if (space) {
-    //             await persistTransformResult({ resTransform: resNewApp, space });
-    //         } else {
-    //             if (logalot) { console.log(`${lc} space falsy, skipping persistence (I: 90aa3553e92ad1d02bce61f83648ea22)`); }
-    //         }
-
-    //         // if ibgibs svc is given, register the new ibgib
-    //         // (in the future, need to revisit the ibgibs service to the idea of locality/ies).
-    //         if (ibgibsSvc) {
-    //             await ibgibsSvc.registerNewIbGib({ ibGib: newAppIbGib, space });
-    //         } else {
-    //             if (logalot) { console.log(`${lc} ibgibsSvc falsy so skipping registerNewIbGib for new app (I: eda4f68fffaf2435eba25cd39d4f2922)`); }
-    //         }
-
-    //         // update this witness' primary ibGib properties (ib, gib, data, rel8ns).
-    //         //   override `loadIbGibDto` to update secondary/derivative properties
-    //         await this.loadIbGibDto(newAppIbGib);
-    //     } catch (error) {
-    //         console.error(`${lc} ${error.message}`);
-    //         throw error;
-    //     } finally {
-    //         if (logalot) { console.log(`${lc} complete.`); }
-    //     }
-    // }
-
     /**
      * validates against common app qualities.
      *
@@ -530,53 +384,6 @@ export abstract class AppBase_V1<
         return result;
     }
 
-    // protected async rel8ToIbGib({
-    //     ibGibToRel8,
-    //     ibGibAddrToRel8,
-    //     contextIbGib,
-    //     rel8nNames,
-    // }: {
-    //     ibGibToRel8?: IbGib_V1,
-    //     ibGibAddrToRel8?: IbGibAddr,
-    //     contextIbGib: IbGib_V1,
-    //     rel8nNames: string[],
-    // }): Promise<void> {
-    //     const lc = `${this.lc}[${this.rel8ToIbGib.name}]`;
-    //     try {
-    //         if (!ibGibToRel8 && !ibGibAddrToRel8) { throw new Error(`ibGibToRel8 or ibGibAddrToRel8 required (E: 3ee14659fd22355a5ba0e537a477be22)`); }
-    //         if (!contextIbGib) { throw new Error(`contextIbGib required (E: 85f27c7cbf713704c21084c141cd8822)`); }
-
-    //         if ((rel8nNames ?? []).length === 0) {
-    //             if (!this.data?.defaultRel8nName) { throw new Error(`either rel8nNames or this.data.defaultRel8nName required (E: a14ab4b3e479d9274c61bc5a30bc2222)`); }
-    //             rel8nNames = [this.data.defaultRel8nName];
-    //         }
-
-    //         // set up the rel8ns to add
-    //         const rel8nsToAddByAddr: IbGibRel8ns_V1 = {};
-    //         ibGibAddrToRel8 = ibGibAddrToRel8 || h.getIbGibAddr({ ibGib: ibGibToRel8 });
-    //         rel8nNames.forEach((rel8nName) => { rel8nsToAddByAddr[rel8nName] = [ibGibAddrToRel8]; });
-
-    //         // perform the rel8 transform and...
-    //         const resRel8ToContext =
-    //             await V1.rel8({
-    //                 src: contextIbGib,
-    //                 rel8nsToAddByAddr,
-    //                 dna: true,
-    //                 nCounter: true
-    //             });
-
-    //         // ...persist it...
-    //         await this.ibgibsSvc.persistTransformResult({ resTransform: resRel8ToContext });
-
-    //         // ...register the context.
-    //         const { newIbGib: newContext } = resRel8ToContext;
-    //         await this.ibgibsSvc.registerNewIbGib({ ibGib: newContext });
-    //     } catch (error) {
-    //         console.error(`${lc} ${error.message}`);
-    //         throw error;
-    //     }
-    // }
-
 }
 
 export interface IbGibAppAny

package/src/witness/app/app-constants.mts

@@ -14,3 +14,6 @@ export const MENU_ITEM_IB_SUBSTRING_LENGTH = 20;
 
 export const QUERY_PARAM_PAUSED = 'paused';
 export const QUERY_PARAM_ROBBOT = 'robbot';
+
+export const APP_NAME_REGEXP = /^[a-zA-Z0-9_\-.]{1,32}$/;
+export const APP_REL8N_NAME = 'app';

package/src/witness/app/app-helper.mts

@@ -3,8 +3,9 @@ import { Gib, Ib, } from '@ibgib/ts-gib';
 import { validateIbGibIntrinsically } from '@ibgib/ts-gib/dist/V1/validate-helper.mjs';
 
 
-import { APP_NAME_REGEXP, APP_REL8N_NAME, GLOBAL_LOG_A_LOT } from '../../core-constants.mjs';
+import { GLOBAL_LOG_A_LOT } from '../../core-constants.mjs';
 import { AppData_V1, } from './app-types.mjs';
+import { APP_NAME_REGEXP, APP_REL8N_NAME, } from './app-constants.mjs';
 import { IbGibAppAny } from './app-base-v1.mjs';
 // import { CommonService } from '../../services/common.service.mjs';
 // import { getFn_promptAppIbGib } from './prompt-functions.mjs';

package/src/witness/app/app-types.mts

@@ -5,11 +5,11 @@ import { IbGibRel8ns_V1, IbGib_V1 } from '@ibgib/ts-gib/dist/V1/index.mjs';
 // import { IonicSpaceData_V1 } from '../witnesses/spaces/ionic-space-v1';
 import {
   WitnessData_V1, WitnessRel8ns_V1,
-  WitnessCmdData, WitnessCmdRel8ns, WitnessCmdIbGib,
   WitnessResultData, WitnessResultRel8ns, WitnessResultIbGib,
 } from '../witness-types.mjs';
 import { IbGibSpaceData_Subpathed } from '../space/space-types.mjs';
 import { IbGibAppAny } from './app-base-v1.mjs';
+import { WitnessCmdData, WitnessCmdRel8ns, WitnessCmdIbGib, } from '../witness-cmd/witness-cmd-types.mjs';