@homedev/objector 0.0.10 → 0.0.11

package/dist/index.js

@@ -1 +1 @@
-import K from"path";import B from"fs/promises";import I from"path";import z from"yaml";var b=async(C)=>{try{return await B.access(C,B.constants.R_OK),!0}catch{return!1}},W=async(C,F)=>{let d=await(async()=>{let j=[""];if(!I.isAbsolute(C)&&F?.dirs)j.push(...F.dirs);for(let D of j){let H=I.join(D,C);if(await b(H))return I.resolve(H)}throw new Error(`File not found: "${C}"`)})(),P=await B.readFile(d),O=I.dirname(d),U={"[.](yml|yaml)$":z.parse,"[.]json$":JSON.parse,...F?.parsers},M=Object.entries(U).find((j)=>d.match(j[0]));if(!M)throw new Error(`Unhandled file type: ${C}`);return{content:M[1](P.toString()),fullPath:d,folderPath:O}};var v=async(C,F)=>{for(let T of C){let d=F?.root?K.join(F.root,T):T,P=await W(d,F?.loadOptions);if(F?.loaded)await F.loaded(P)}};var L=(C,F,T)=>{for(let d of Object.keys(F)){if(C[d]===void 0)continue;let P=F[d],O=C[d];if(typeof O!==typeof P||Array.isArray(O)!==Array.isArray(P)){let M=T?.mismatch?.(d,O,P,C,F);if(M!==void 0){F[d]=M;continue}throw new Error(`Type mismatch: ${d}`)}let U=T?.mode?.(d,O,P,C,F)??"merge";switch(U){case"source":F[d]=O;continue;case"target":continue;case"skip":delete F[d],delete C[d];continue;case"merge":break;default:throw new Error(`Unknown merge mode: ${U}`)}if(typeof O==="object")if(Array.isArray(O))P.push(...O);else{if(T?.navigate?.(d,O,P,C,F)===!1)continue;L(O,P,T)}else{if(O===P)continue;let M=T?.conflict?.(d,O,P,C,F);F[d]=M===void 0?P:M}}for(let d of Object.keys(C))if(F[d]===void 0)F[d]=C[d]};var Y;((O)=>{O[O.Continue=0]="Continue";O[O.Skip=1]="Skip";O[O.ReplaceItem=2]="ReplaceItem";O[O.ReplaceParent=3]="ReplaceParent";O[O.DeleteParent=4]="DeleteParent"})(Y||={});class E{action;by;constructor(C,F){this.action=C;this.by=F}static ReplaceParent(C){return new E(3,C)}static ReplaceItem(C){return new E(2,C)}static Skip(){return new E(1)}static Continue(){return new E(0)}static DeleteParent(){return new E(4)}}var q=async(C,F)=>{let T=async(P)=>{for(let[O,U]of Object.entries(P.value)){let M=await d({key:O,value:U,path:P.path,parent:P.value});switch(M.action){case 3:if(!P.key)throw new Error("Cannot replace root");P.parent[P.key]=M.by;return;case 2:P.value[O]=M.by;break;case 1:return;case 4:delete P.parent[P.key];return}}},d=async(P)=>{let O=P.key?await F(P):{action:0};if(O.action===0){if(P.value&&typeof P.value==="object"){if(P.key)P.path.push(P.key);if(await T(P),P.key)P.path.pop()}}return O};await d({key:null,value:C,path:[],parent:null})};var J=async(C,F,T,d,P)=>{for(let O of P?.functions??[]){let U=O[0].exec(T.value);if(U){let[,M,...w]=U;if(O[1][M])return E.ReplaceItem(await O[1][M]({args:w,path:F,value:C.value,root:d,key:M,options:P}))}}};var Q=async(C,F,T,d)=>{for(let P of d?.keys??[]){let O=P[0].exec(C.key);if(O){let[,U,...M]=O;if(P[1][U]){let w={args:M,path:F,value:C.value,root:T,parent:C.parent,key:C.key,origin:d?.origin,options:d},j=await P[1][U](w);if(j===null)return E.DeleteParent();if(j===void 0)return E.Continue();return E.ReplaceParent(j)}}}};var S=(C,F,T,d)=>{for(let P of d?.sources??[])F.value=F.value.replaceAll(P[0],(O,U,...M)=>P[1][U]?.({args:M,path:C,value:F.value,root:T,key:U,options:d})??O)};var X=(C,F)=>{for(let[T,d]of F?.variables??[])C.value=C.value.replaceAll(T,(P,O)=>d[O]??P)};var PF=async(C,F)=>q(C,async(T)=>{let d=[...T.path,T.key].join(".");if(F?.filters){if(!F.filters.some((O)=>O.test(d)))return E.Continue()}let P=await Q(T,d,C,F);if(P)return P;if(typeof T.value==="string"){let O={value:T.value};return S(d,O,C,F),X(O,F),await J(T,d,O,C,F)??(T.value!==O.value?E.ReplaceItem(O.value):E.Continue())}return E.Continue()});import _ from"yaml";var Z=(C,F="name")=>Object.entries(C).map(([T,d])=>({[F]:T,...d})),TF=(C,F="name")=>Object.fromEntries(C.map((T)=>[T[F],T])),$=(C,F="name")=>Object.fromEntries(C.map((T)=>{let{[F]:d,...P}=T;return[d,P]}));var r=(C,F)=>{let T=/^\[([^=\]]*)([=]*)([^\]]*)\]$/.exec(F);if(T){let[P,O,U,M]=T;if(Array.isArray(C))switch(U){case"==":case"=":return C.find((w)=>w[O.trim()]==M.trim())}}let d=/^([^[\]]*)\[([^\]]*)]/.exec(F);if(d)return C[d[1]][d[2]];return C[F]},G=(C,F,T)=>{let d=void 0,P=void 0;F??="";let O=(M,w)=>{let j=w.pop();if(j){let D=r(M,j);if(!D)throw new Error(`Unknown path element: "${j}" in "${F}"`);return d=M,P=j,O(D,w)}if(T?.set&&P)d[P]=T?.set;return M},U=O(C,F.split(T?.separator??".").reverse());switch(T?.format){case"list":return Z(U,T?.key);case"object":return $(U,T?.key);case"json":return JSON.stringify(U);case"yaml":return _.stringify(U);default:return U}},wF=(C,F)=>{let T=/^(?<path>[^@>]*)?(?:@(?<from>[^>]*))?(?:>(?<format>[^|]*)(?:\|(?<key>.*))?)?$/.exec(C)?.groups;if(!T)throw new Error(`Invalid reference: "${C}"`);let{from:d,path:P,format:O,key:U}=T;if(!d)return G(F.root,P,{format:O,key:U});if(F.async===!1){if(!F.load)throw new Error("No load function defined");return G(F.load(d),P,{format:O,key:U})}else return(F.load??W)(d).then((M)=>G(M,P,{format:O,key:U}))};var WF=async(C,F)=>{let T=[];return await q(C,(d)=>{if(F([...d.path,d.key].join("."),d.value))T.push(d.value);return E.Continue()}),T};export{TF as toObjectWithKey,$ as toObject,Z as toList,G as selectPath,wF as select,v as processIncludes,PF as processFields,q as navigate,L as merge,W as load,WF as find,E as NavigateResult,Y as NavigateAction};
+import b from"path";import J from"fs/promises";import B from"path";import z from"yaml";var _=async(O)=>{try{return await J.access(O,J.constants.R_OK),!0}catch{return!1}},G=async(O,T)=>{let F=await(async()=>{let D=[""];if(!B.isAbsolute(O)&&T?.dirs)D.push(...T.dirs);for(let I of D){let q=B.join(I,O);if(await _(q))return B.resolve(q)}throw new Error(`File not found: "${O}"`)})(),P=await J.readFile(F),j=B.dirname(F),E={"[.](yml|yaml)$":z.parse,"[.]json$":JSON.parse,...T?.parsers},M=Object.entries(E).find((D)=>F.match(D[0]));if(!M)throw new Error(`Unhandled file type: ${O}`);return{content:M[1](P.toString()),fullPath:F,folderPath:j}};var k=async(O,T)=>{for(let C of O){let F=T?.root?b.join(T.root,C):C,P=await G(F,T?.loadOptions);if(T?.loaded)await T.loaded(P)}};var f=(O,T,C)=>{for(let F of Object.keys(T)){if(O[F]===void 0)continue;let P=T[F],j=O[F];if(typeof j!==typeof P||Array.isArray(j)!==Array.isArray(P)){let M=C?.mismatch?.(F,j,P,O,T);if(M!==void 0){T[F]=M;continue}throw new Error(`Type mismatch: ${F}`)}let E=C?.mode?.(F,j,P,O,T)??"merge";switch(E){case"source":T[F]=j;continue;case"target":continue;case"skip":delete T[F],delete O[F];continue;case"merge":break;default:throw new Error(`Unknown merge mode: ${E}`)}if(typeof j==="object")if(Array.isArray(j))P.push(...j);else{if(C?.navigate?.(F,j,P,O,T)===!1)continue;f(j,P,C)}else{if(j===P)continue;let M=C?.conflict?.(F,j,P,O,T);T[F]=M===void 0?P:M}}for(let F of Object.keys(O))if(T[F]===void 0)T[F]=O[F]};var K;((j)=>{j[j.Continue=0]="Continue";j[j.Skip=1]="Skip";j[j.ReplaceItem=2]="ReplaceItem";j[j.ReplaceParent=3]="ReplaceParent";j[j.DeleteParent=4]="DeleteParent"})(K||={});class w{action;by;constructor(O,T){this.action=O;this.by=T}static ReplaceParent(O){return new w(3,O)}static ReplaceItem(O){return new w(2,O)}static Skip(){return new w(1)}static Continue(){return new w(0)}static DeleteParent(){return new w(4)}}var H=async(O,T)=>{let C=async(P)=>{for(let[j,E]of Object.entries(P.value)){let M=await F({key:j,value:E,path:P.path,parent:P.value});switch(M.action){case 3:if(!P.key)throw new Error("Cannot replace root");P.parent[P.key]=M.by;return;case 2:P.value[j]=M.by;break;case 1:return;case 4:delete P.parent[P.key];return}}},F=async(P)=>{let j=P.key?await T(P):{action:0};if(j.action===0){if(P.value&&typeof P.value==="object"){if(P.key)P.path.push(P.key);if(await C(P),P.key)P.path.pop()}}return j};await F({key:null,value:O,path:[],parent:null})};var S=async(O,T,C,F)=>{for(let[P,j]of F?.keys??[]){let E=P.exec(O.key);if(E){let[,M,...W]=E;if(j[M]){let D={args:[O.value,...W],path:T,value:O.value,root:C,parent:O.parent,key:O.key,origin:F?.origin,options:F},I=typeof j[M]==="function"?await j[M](D):j[M];if(I===null)return w.DeleteParent();if(I===void 0)return w.Continue();return w.ReplaceParent(I)}}}};var U=async(O,T,C,F)=>{let P,j=[],E=T;for(let[M,W]of F?.sources??[]){if(P)break;E=E.replaceAll(M,(D,I,...q)=>{if(P)return D;let $=W[I];if(typeof $!=="object"&&typeof $!=="function")return $??D;if(typeof $==="object")return P=$,D;let d=$({args:q,path:O,value:E,root:C,key:I,options:F});if(typeof d==="object")return P=d,D;return d instanceof Promise?`ð[${j.push(d)}]ñ`:d})}if(P){let M=await P;if(M===null)return w.DeleteParent();if(M)return w.ReplaceItem(M)}if(j.length){let M=await Promise.all(j);E=E.replaceAll(/\xf0\[(\d+)]\xf1/g,(W,D)=>M[+D-1])}return E===T?w.Continue():w.ReplaceItem(E)};var e=async(O,T)=>H(O,async(C)=>{let F=[...C.path,C.key].join(".");if(T?.filters){if(!T.filters.some((P)=>P.test(F)))return w.Continue()}return await S(C,F,O,T)??(typeof C.value==="string"?await U(F,C.value,O,T):w.Continue())});import L from"yaml";var X=(O,T="name")=>Object.entries(O).map(([C,F])=>({[T]:C,...F})),FF=(O,T="name")=>Object.fromEntries(O.map((C)=>[C[T],C])),Z=(O,T="name")=>Object.fromEntries(O.map((C)=>{let{[T]:F,...P}=C;return[F,P]}));var Y=(O,T)=>{let C=/^\[([^=\]]*)([=]*)([^\]]*)\]$/.exec(T);if(C){let[P,j,E,M]=C;if(Array.isArray(O))switch(E){case"==":case"=":return O.find((W)=>W[j.trim()]==M.trim())}}let F=/^([^[\]]*)\[([^\]]*)]/.exec(T);if(F)return O[F[1]][F[2]];return O[T]},Q=(O,T,C)=>{let F=void 0,P=void 0;T??="";let j=(M,W)=>{let D=W.pop();if(D){let I=Y(M,D);if(!I)throw new Error(`Unknown path element: "${D}" in "${T}"`);return F=M,P=D,j(I,W)}if(C?.set&&P)F[P]=C?.set;return M},E=j(O,T.split(C?.separator??".").reverse());switch(C?.format){case"list":return X(E,C?.key);case"object":return Z(E,C?.key);case"json":return JSON.stringify(E);case"yaml":return L.stringify(E);default:return E}},CF=(O,T)=>{let C=/^(?<path>[^@>]*)?(?:@(?<from>[^>]*))?(?:>(?<format>[^|]*)(?:\|(?<key>.*))?)?$/.exec(O)?.groups;if(!C)throw new Error(`Invalid reference: "${O}"`);let{from:F,path:P,format:j,key:E}=C;if(!F)return Q(T.root,P,{format:j,key:E});if(T.async===!1){if(!T.load)throw new Error("No load function defined");return Q(T.load(F),P,{format:j,key:E})}else return(T.load??G)(F).then((M)=>Q(M,P,{format:j,key:E}))};var wF=async(O,T)=>{let C=[];return await H(O,(F)=>{if(T([...F.path,F.key].join("."),F.value))C.push(F.value);return w.Continue()}),C};export{FF as toObjectWithKey,Z as toObject,X as toList,Q as selectPath,CF as select,k as processIncludes,e as processFields,H as navigate,f as merge,G as load,wF as find,w as NavigateResult,K as NavigateAction};

package/dist/objector.d.ts

@@ -18,16 +18,10 @@ export declare interface FieldContext {
     options?: ProcessFieldsOptions;
 }
 
-export declare type FieldProcessorAsyncMap = Record<string, (context: FieldContext) => MaybePromise<any>>;
-
-export declare type FieldProcessorMap = Record<string, (context: FieldContext) => any>;
+export declare type FieldProcessorMap = Record<string, ((context: FieldContext) => MaybePromise<any>) | string | number | object | boolean>;
 
 export declare type FieldProcessorMatcher = [matcher: RegExp, handlers: FieldProcessorMap];
 
-export declare type FieldProcessorMatcherAsync = [matcher: RegExp, handlers: FieldProcessorAsyncMap];
-
-export declare type FieldVariableMatcher = [matcher: RegExp, variables: Record<string, any>];
-
 /**
  * @public
  * @param from
@@ -143,9 +137,7 @@ export declare const processFields: (root: any, options?: ProcessFieldsOptions)
 
 export declare interface ProcessFieldsOptions {
     sources?: FieldProcessorMatcher[];
-    functions?: FieldProcessorMatcherAsync[];
-    keys?: FieldProcessorMatcherAsync[];
-    variables?: FieldVariableMatcher[];
+    keys?: FieldProcessorMatcher[];
     filters?: RegExp[];
     origin?: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homedev/objector",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "object extensions for YAML/JSON",
   "author": "julzor",
   "license": "ISC",