dot => semantic divider

Author: Leif Shackelford

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-moss",
   "description": "moss is a set of parsing rules for yaml and json",
-  "version": "0.22.30",
+  "version": "0.22.31",
   "homepage": "https://github.com/1e1f/js-moss",
   "author": {
     "name": "Leif Shackelford",

src/async.ts

@@ -193,7 +193,7 @@ export const parseObject = async (current: Moss.ReturnValue) => {
         if (readKey[0] === "$") {
           try {
             writeKey = <any>(await interpolate(current, readKey)).data;
-          } catch (e) {}
+          } catch (e) { }
         } else if (readKey[0] == "\\") {
           writeKey = readKey.slice(1);
         } else {
@@ -770,9 +770,8 @@ async function _interpolate(
         }
         if (!(resolvedBranches && resolvedBranches.length)) {
           throw {
-            message: `No async results for ${bl}, in ${
-              Object.keys(resolvers).length
-            } resolvers @ ${toYaml(layer.data)}`,
+            message: `No async results for ${bl}, in ${Object.keys(resolvers).length
+              } resolvers @ ${toYaml(layer.data)}`,
           };
         }
         const parsedBranches = [];

src/branch/canonical.ts

@@ -2,10 +2,14 @@ import { Moss } from "../types";
 import { decode, encode } from "./parser";
 
 export const canonicalBl = (bl: string | Moss.Branch) => {
-  if (typeof bl == "string") {
-    return encode(decode(bl));
+  try {
+    if (typeof bl == "string") {
+      return encode(decode(bl));
+    }
+    return encode(canonicalBranchLocator(bl));
+  } catch (e) {
+    console.error("canonicalBl bl failed for input", bl)
   }
-  return encode(canonicalBranchLocator(bl));
 };
 
 export const disambiguatedHash = (org: string) => {

src/branch/indexer.ts

@@ -112,6 +112,9 @@ const blIndexer: IndexProducer<BLIndex> = {
   keyPath: "deps",
 };
 
+
+
+
 const branchIndexer = [blIndexer];
 
 const indexAny = (
@@ -227,13 +230,20 @@ export const createBranchIndex = (
   // console.log("createdKindIndex", kind.n);
   const bi: SearchIndex = {};
   indexAny(ast, branchIndexer, bi, hashFunctions);
+  if (ast.data?.market) {
+    bi.m = ast.data?.market;
+  }
   return {
     ...bi,
     bl,
     kind,
   };
 };
 
+export const marketIndex = {
+  market: "s.m"
+};
+
 export const indexPaths = {
   organization: "s.bl.o",
   name: "s.bl.n",

src/branch/parser/compiled/hydrate.ts

@@ -199,8 +199,8 @@ const grammar: Grammar = {
     {"name": "disambiguatedChunk", "symbols": ["disambiguatedChunk", "_", "nonSemanticDivider"], "postprocess": join},
     {"name": "disambiguatedChunk", "symbols": ["disambiguatedString"], "postprocess": id},
     {"name": "gap", "symbols": ["__"], "postprocess": () => " "},
-    {"name": "semanticDivider", "symbols": [/[/]/], "postprocess": token},
-    {"name": "nonSemanticDivider", "symbols": [/[-'.&_]/], "postprocess": token},
+    {"name": "semanticDivider", "symbols": [/[./]/], "postprocess": token},
+    {"name": "nonSemanticDivider", "symbols": [/[-&#'_()+]/], "postprocess": token},
     {"name": "disambiguatedString$ebnf$1", "symbols": ["disambiguatedChar"]},
     {"name": "disambiguatedString$ebnf$1", "symbols": ["disambiguatedString$ebnf$1", "disambiguatedChar"], "postprocess": (d) => d[0].concat([d[1]])},
     {"name": "disambiguatedString", "symbols": ["disambiguatedString$ebnf$1"], "postprocess": stringOfSame},

src/branch/parser/grammars/hydrate.ne

@@ -179,10 +179,10 @@ gap
   -> __ {% () => " " %}
 
 semanticDivider
-	-> [/] {% token %}
+  -> [./] {% token %}
 
 nonSemanticDivider
-  -> [-'.&_] {% token %}
+  -> [-&#'_()+] {% token %}
 
 disambiguatedString
 	-> disambiguatedChar:+ {% stringOfSame %}

src/index.ts

@@ -10,4 +10,4 @@ export { Async, Sync };
 
 import "./moreFunctions";
 
-export type { Moss, importPrefix, queryPrefix } from "./types";
+export { Moss, importPrefix, queryPrefix } from "./types";

src/types.ts

@@ -24,6 +24,7 @@ export interface BLIndex {
 
 export interface SearchIndex extends BLIndex {
   kind?: BLIndex;
+  m?: string;
   deps?: BLIndex[];
   bl?: BLIndex;
 }

src/yaml/index.ts

@@ -11,7 +11,7 @@ export const toYaml = (obj: any, options?: any): string => {
 
 export const fromYaml = (yaml: string, options?: any): any => {
   if (!yaml) {
-    console.warn("loading empty yaml string");
+    console.debug("loading empty yaml string");
     return {};
   }
   return load(yaml, options);

test/branchLocator.test.ts

@@ -77,15 +77,16 @@ const shouldPass = [
       organizationSegment: 'has-hyphen',
     }
   },
-  {
-    informalBl: 'This name is a sentence.@Org~Prj',
-    canonicalBl: 'thisnameisasentence@org~prj',
-    branch: {
-      nameSegment: 'This name is a sentence.',
-      projectSegment: 'Prj',
-      organizationSegment: 'Org',
-    }
-  },
+  // This is no longer allowed (ending with dot)
+  // {
+  //   informalBl: 'This name is a sentence.@Org~Prj',
+  //   canonicalBl: 'thisnameisasentence.@org~prj',
+  //   branch: {
+  //     nameSegment: 'This name is a sentence.',
+  //     projectSegment: 'Prj',
+  //     organizationSegment: 'Org',
+  //   }
+  // },
   {
     informalBl: 'main@QA~test',
     canonicalBl: 'main@qa~test',