isomorphic-region-loader 21.0.27 → 21.0.29

package/lib-prod/region-remover.js

@@ -1,126 +1,121 @@
-import { REGEX_REGION, TAGS } from "tnp-core/lib-prod";
-import { path, ___NS__first, ___NS__isUndefined, ___NS__last } from "tnp-core/lib-prod";
-import { UtilsTypescript__NS__removeTaggedImportExport } from "tnp-helpers/lib-prod";
-import { Region } from "./region";
-class RegionRemover {
-  constructor(realtiveOrAbsFilePAth, fileExtension, content, replacementss, project) {
-    this.realtiveOrAbsFilePAth = realtiveOrAbsFilePAth;
-    this.content = content;
-    this.project = project;
-    if (REGEX_REGION.TS_JS_SCSS_SASS.EXT.includes(fileExtension)) {
-      this.START_REGION.push(REGEX_REGION.TS_JS_SCSS_SASS.START);
-      this.END_REGION.push(REGEX_REGION.TS_JS_SCSS_SASS.END);
-    }
-    if (REGEX_REGION.HTML.EXT.includes(fileExtension)) {
-      this.START_REGION.push(REGEX_REGION.HTML.START);
-      this.END_REGION.push(REGEX_REGION.HTML.END);
+//#region imports
+import { REGEX_REGION, TAGS } from 'tnp-core/lib-prod';
+import { path, ___NS__first, ___NS__isUndefined, ___NS__last } from 'tnp-core/lib-prod';
+import { UtilsTypescript__NS__removeTaggedImportExport } from 'tnp-helpers/lib-prod';
+import { Region } from './region';
+//#endregion
+export class RegionRemover {
+    static from(realtiveOrAbsFilePAth, content, replacementss, // Models.dev.Replacement[],
+    project) {
+        let fileExtension = path.extname(realtiveOrAbsFilePAth);
+        if (!replacementss) {
+            replacementss = [
+                [TAGS.BACKEND_FUNC, `return (void 0);`],
+                TAGS.BACKEND,
+            ];
+        }
+        return new RegionRemover(realtiveOrAbsFilePAth, fileExtension, content, replacementss, project);
     }
-    if (REGEX_REGION.CSS.EXT.includes(fileExtension)) {
-      this.START_REGION.push(REGEX_REGION.CSS.START);
-      this.END_REGION.push(REGEX_REGION.CSS.END);
+    matchStartRegion(l) {
+        const res = !___NS__isUndefined(this.START_REGION.find(r => l.match(r)));
+        return res;
     }
-    this.content = UtilsTypescript__NS__removeTaggedImportExport(
-      this.content,
-      replacementss
-      // debug,
-    ) || "";
-    const lines = this.content.split("\n");
-    this.root = new Region(
-      this,
-      replacementss,
-      void 0,
-      0,
-      lines.length - 1,
-      ___NS__first(lines),
-      ___NS__last(lines),
-      lines
-    );
-    this.tree(this.root);
-  }
-  root;
-  START_REGION = [];
-  END_REGION = [];
-  static from(realtiveOrAbsFilePAth, content, replacementss, project) {
-    let fileExtension = path.extname(realtiveOrAbsFilePAth);
-    if (!replacementss) {
-      replacementss = [
-        [TAGS.BACKEND_FUNC, `return (void 0);`],
-        TAGS.BACKEND
-      ];
+    matchEndRegion(l) {
+        const res = !___NS__isUndefined(this.END_REGION.find(r => l.match(r)));
+        return res;
     }
-    return new RegionRemover(
-      realtiveOrAbsFilePAth,
-      fileExtension,
-      content,
-      replacementss,
-      project
-      // debug,
-    );
-  }
-  matchStartRegion(l) {
-    const res = !___NS__isUndefined(this.START_REGION.find((r) => l.match(r)));
-    return res;
-  }
-  matchEndRegion(l) {
-    const res = !___NS__isUndefined(this.END_REGION.find((r) => l.match(r)));
-    return res;
-  }
-  tree(node) {
-    const contentLines = node.contentLines;
-    let stack = 0;
-    for (let i = 0; i < contentLines.length; i++) {
-      const l = contentLines[i];
-      if (!node.isRoot) {
-        if (i === 0) {
-          node.addNormalLine(l, 0);
-          continue;
+    constructor(realtiveOrAbsFilePAth, fileExtension, content, replacementss, // Models.dev.Replacement[],
+    project) {
+        this.realtiveOrAbsFilePAth = realtiveOrAbsFilePAth;
+        this.content = content;
+        this.project = project;
+        this.START_REGION = [];
+        this.END_REGION = [];
+        if (REGEX_REGION.TS_JS_SCSS_SASS.EXT.includes(fileExtension)) {
+            this.START_REGION.push(REGEX_REGION.TS_JS_SCSS_SASS.START);
+            this.END_REGION.push(REGEX_REGION.TS_JS_SCSS_SASS.END);
         }
-        if (i === node.contentLines.length - 1) {
-          node.addNormalLine(l, i);
-          continue;
+        if (REGEX_REGION.HTML.EXT.includes(fileExtension)) {
+            this.START_REGION.push(REGEX_REGION.HTML.START);
+            this.END_REGION.push(REGEX_REGION.HTML.END);
         }
-      }
-      if (node.lastRegionWithoutEnd) {
-        if (this.matchStartRegion(l)) {
-          node.addNormalLineToLastRegion(l, i);
-          stack++;
-        } else if (this.matchEndRegion(l)) {
-          if (stack === 0) {
-            node.endLastRegion(i, l);
-          } else if (stack > 0) {
-            node.addNormalLineToLastRegion(l, i);
-            stack--;
-          }
-        } else {
-          if (i === node.contentLines.length - (node.isRoot ? 1 : 2)) {
-            stack = 0;
-            node.endLastRegion(i, l);
-          } else {
-            node.addNormalLineToLastRegion(l, i);
-          }
+        if (REGEX_REGION.CSS.EXT.includes(fileExtension)) {
+            this.START_REGION.push(REGEX_REGION.CSS.START);
+            this.END_REGION.push(REGEX_REGION.CSS.END);
+        }
+        this.content =
+            UtilsTypescript__NS__removeTaggedImportExport(this.content, replacementss) || '';
+        const lines = this.content.split('\n');
+        this.root = new Region(this, replacementss, void 0, 0, lines.length - 1, ___NS__first(lines), ___NS__last(lines), lines);
+        this.tree(this.root);
+    }
+    tree(node) {
+        const contentLines = node.contentLines;
+        // if (contentLines.length <= 3) {
+        //   for (let i = 0; i < contentLines.length; i++) {
+        //     const l = contentLines[i];
+        //     node.addNormalLine(l, i);
+        //   }
+        // } else {
+        let stack = 0;
+        for (let i = 0; i < contentLines.length; i++) {
+            const l = contentLines[i];
+            if (!node.isRoot) {
+                if (i === 0) {
+                    node.addNormalLine(l, 0);
+                    continue;
+                }
+                if (i === node.contentLines.length - 1) {
+                    node.addNormalLine(l, i);
+                    continue;
+                }
+            }
+            if (node.lastRegionWithoutEnd) {
+                if (this.matchStartRegion(l)) {
+                    node.addNormalLineToLastRegion(l, i);
+                    stack++;
+                }
+                else if (this.matchEndRegion(l)) {
+                    if (stack === 0) {
+                        node.endLastRegion(i, l);
+                    }
+                    else if (stack > 0) {
+                        node.addNormalLineToLastRegion(l, i);
+                        stack--;
+                    }
+                }
+                else {
+                    if (i === node.contentLines.length - (node.isRoot ? 1 : 2)) {
+                        stack = 0;
+                        node.endLastRegion(i, l);
+                    }
+                    else {
+                        node.addNormalLineToLastRegion(l, i);
+                    }
+                }
+            }
+            else {
+                if (this.matchStartRegion(l)) {
+                    node.addRegion(this, node, i, l);
+                }
+                else if (this.matchEndRegion(l)) {
+                    node.addNormalLine(l, i);
+                }
+                else {
+                    node.addNormalLine(l, i);
+                }
+            }
         }
-      } else {
-        if (this.matchStartRegion(l)) {
-          node.addRegion(this, node, i, l);
-        } else if (this.matchEndRegion(l)) {
-          node.addNormalLine(l, i);
-        } else {
-          node.addNormalLine(l, i);
+        // }
+        const children = node.regions;
+        if (children.length > 0) {
+            for (let index = 0; index < children.length; index++) {
+                const child = children[index];
+                this.tree(child);
+            }
         }
-      }
     }
-    const children = node.regions;
-    if (children.length > 0) {
-      for (let index = 0; index < children.length; index++) {
-        const child = children[index];
-        this.tree(child);
-      }
+    get output() {
+        return this.root.toString();
     }
-  }
-  get output() {
-    return this.root.toString();
-  }
 }
-export {
-  RegionRemover
-};

package/lib-prod/region.js

@@ -1,160 +1,180 @@
-import { ___NS__first, ___NS__isArray, ___NS__last, ___NS__times } from "tnp-core/lib-prod";
-import { TAGS } from "tnp-core/lib-prod";
-import { labelReplacementCode } from "./models";
-class Region {
-  constructor(context, replacementss, parent, startIndex, endIndex, lineStart, lineEnd, contentLines = []) {
-    this.context = context;
-    this.replacementss = replacementss;
-    this.parent = parent;
-    this.startIndex = startIndex;
-    this.endIndex = endIndex;
-    this.lineStart = lineStart;
-    this.lineEnd = lineEnd;
-    this.contentLines = contentLines;
-  }
-  tmpOutput;
-  get hasEnd() {
-    return this.endIndex !== void 0;
-  }
-  get lastRegionWithoutEnd() {
-    const last = ___NS__last(this.regionsOrStrings);
-    if (last instanceof Region && !last.hasEnd) {
-      return last;
+//#region imports
+import { ___NS__first, ___NS__isArray, ___NS__last, ___NS__times } from 'tnp-core/lib-prod';
+import { TAGS } from 'tnp-core/lib-prod';
+import { labelReplacementCode } from './models';
+//#endregion
+export class Region {
+    constructor(context, replacementss, parent, startIndex, endIndex, lineStart, lineEnd, contentLines = []) {
+        this.context = context;
+        this.replacementss = replacementss;
+        this.parent = parent;
+        this.startIndex = startIndex;
+        this.endIndex = endIndex;
+        this.lineStart = lineStart;
+        this.lineEnd = lineEnd;
+        this.contentLines = contentLines;
+        this.regionsOrStrings = [];
     }
-    return void 0;
-  }
-  regionsOrStrings = [];
-  get regions() {
-    return this.regionsOrStrings.filter((f) => f instanceof Region);
-  }
-  setEnd(endIndex, lineEnd) {
-    this.endIndex = endIndex;
-    this.lineEnd = lineEnd;
-  }
-  get isRoot() {
-    return !this.parent;
-  }
-  addNormalLine(l, lineIndex) {
-    this.contentLines[lineIndex] = void 0;
-    this.regionsOrStrings.push(l);
-  }
-  addNormalLineToLastRegion(l, lineIndex) {
-    this.contentLines[lineIndex] = void 0;
-    this.lastRegionWithoutEnd.contentLines.push(l);
-  }
-  addRegion(context, parent, startIndex, lineStart) {
-    this.contentLines[startIndex] = void 0;
-    const newReg = new Region(
-      context,
-      this.replacementss,
-      parent,
-      startIndex,
-      void 0,
-      lineStart,
-      void 0,
-      [lineStart]
-    );
-    this.regionsOrStrings.push(newReg);
-  }
-  endLastRegion(endIndex, lineEnd) {
-    this.contentLines[endIndex] = void 0;
-    const regionWithoutEnd = this.regionsOrStrings.find(
-      (r) => r instanceof Region && !r.hasEnd
-    );
-    regionWithoutEnd.contentLines.push(lineEnd);
-    regionWithoutEnd.setEnd(endIndex, lineEnd);
-  }
-  containsTitle(s) {
-    const res = this.titleString.search(s) !== -1;
-    return res;
-  }
-  get titleString() {
-    let line = this.lineStart;
-    const regionWord = "#region";
-    const indexOfRegion = line.search(regionWord);
-    line = line.replace(line.slice(0, indexOfRegion + regionWord.length), "");
-    return line.replace("-->", "").replace("<!--", "");
-  }
-  toString() {
-    if (this.tmpOutput !== void 0) {
-      return this.tmpOutput;
+    get hasEnd() {
+        return this.endIndex !== void 0;
     }
-    let previous = "";
-    this.tmpOutput = this.regionsOrStrings.map((regionOrString) => {
-      if (regionOrString instanceof Region) {
-        const replacements = this.replacementss;
-        for (let index = 0; index < replacements.length; index++) {
-          const rep = replacements[index];
-          const isArr = ___NS__isArray(replacements[index]);
-          const regionTag = isArr ? ___NS__first(rep) : rep;
-          let out = isArr ? rep[1] : "";
-          const verticalLength = regionOrString.toString().split("\n").length - 1;
-          if (regionOrString.containsTitle(regionTag)) {
-            if (regionTag.toLowerCase() === TAGS.WEBSQL.toLowerCase()) {
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.backendCode + "\n").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.BACKEND.toLowerCase()) {
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.backendCode + "\n").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.NOT_FOR_NPM.toLowerCase()) {
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.notForNpmCode + "\n").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.BROWSER.toLowerCase()) {
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.browserCode + "\n").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.WEBSQL_ONLY.toLowerCase()) {
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.backendCode + "\n").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.BACKEND_FUNC.toLowerCase()) {
-              let spacesPrevious = previous.search(/\S/);
-              spacesPrevious = spacesPrevious < 0 ? 0 : spacesPrevious;
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.backendCode + "\n").join("")}${___NS__times(spacesPrevious).map((n) => " ").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.WEBSQL_FUNC.toLowerCase()) {
-              let spacesPrevious = previous.search(/\S/);
-              spacesPrevious = spacesPrevious < 0 ? 0 : spacesPrevious;
-              out = `${___NS__times(verticalLength).map(() => labelReplacementCode.backendCode + "\n").join("")}${___NS__times(spacesPrevious).map((n) => " ").join("")}  ${out}`;
-            }
-            if (regionTag.toLowerCase() === TAGS.CUT_CODE_IF_TRUE.toLowerCase() || regionTag.toLowerCase() === TAGS.CUT_CODE_IF_FALSE.toLowerCase()) {
-              const fn = out;
-              let expressionToExecute = regionOrString.titleString;
-              expressionToExecute = expressionToExecute.replace(
-                regionTag,
-                ""
-              );
-              const configForProject = this.project && this.project.env.config;
-              const cutCode = fn(
-                expressionToExecute,
-                configForProject,
-                this.realtiveOrAbsFilePAth
-              );
-              if (cutCode === null) {
-                continue;
-              }
-              if (cutCode && regionTag.toLowerCase() === TAGS.CUT_CODE_IF_TRUE.toLowerCase() || !cutCode && regionTag.toLowerCase() === TAGS.CUT_CODE_IF_FALSE.toLowerCase()) {
-                out = "";
-              } else {
-                continue;
-              }
-            }
-            regionOrString.tmpOutput = out;
-            break;
-          }
+    get lastRegionWithoutEnd() {
+        const last = ___NS__last(this.regionsOrStrings);
+        if (last instanceof Region && !last.hasEnd) {
+            return last;
         }
-      }
-      const res = regionOrString.toString();
-      previous = res;
-      return res;
-    }).join("\n");
-    return this.tmpOutput;
-  }
-  get project() {
-    return this.context.project;
-  }
-  get realtiveOrAbsFilePAth() {
-    return this.context.realtiveOrAbsFilePAth;
-  }
+        return void 0;
+    }
+    get regions() {
+        return this.regionsOrStrings.filter(f => f instanceof Region);
+    }
+    setEnd(endIndex, lineEnd) {
+        this.endIndex = endIndex;
+        this.lineEnd = lineEnd;
+    }
+    get isRoot() {
+        return !this.parent;
+    }
+    addNormalLine(l, lineIndex) {
+        this.contentLines[lineIndex] = void 0;
+        this.regionsOrStrings.push(l);
+    }
+    addNormalLineToLastRegion(l, lineIndex) {
+        this.contentLines[lineIndex] = void 0;
+        this.lastRegionWithoutEnd.contentLines.push(l);
+    }
+    addRegion(context, parent, startIndex, lineStart) {
+        this.contentLines[startIndex] = void 0;
+        const newReg = new Region(context, this.replacementss, parent, startIndex, void 0, lineStart, void 0, [lineStart]);
+        this.regionsOrStrings.push(newReg);
+    }
+    endLastRegion(endIndex, lineEnd) {
+        this.contentLines[endIndex] = void 0;
+        const regionWithoutEnd = this.regionsOrStrings.find(r => r instanceof Region && !r.hasEnd);
+        regionWithoutEnd.contentLines.push(lineEnd);
+        regionWithoutEnd.setEnd(endIndex, lineEnd);
+    }
+    containsTitle(s) {
+        const res = this.titleString.search(s) !== -1;
+        // Helpers__NS__log(`checking tag (${res}): "${s}" in line: "${this.titleString}"`)
+        return res;
+    }
+    get titleString() {
+        let line = this.lineStart;
+        const regionWord = '#region';
+        const indexOfRegion = line.search(regionWord);
+        line = line.replace(line.slice(0, indexOfRegion + regionWord.length), '');
+        return line.replace('-->', '').replace('<!--', ''); // TODO not necessery ?
+    }
+    toString() {
+        if (this.tmpOutput !== void 0) {
+            return this.tmpOutput;
+        }
+        let previous = '';
+        this.tmpOutput = this.regionsOrStrings
+            .map(regionOrString => {
+            if (regionOrString instanceof Region) {
+                //#region handle region
+                const replacements = this.replacementss;
+                for (let index = 0; index < replacements.length; index++) {
+                    const rep = replacements[index];
+                    const isArr = ___NS__isArray(replacements[index]);
+                    const regionTag = (isArr ? ___NS__first(rep) : rep);
+                    let out = (isArr ? rep[1] : '');
+                    const verticalLength = regionOrString.toString().split('\n').length - 1;
+                    if (regionOrString.containsTitle(regionTag)) {
+                        if (regionTag.toLowerCase() === TAGS.WEBSQL.toLowerCase()) {
+                            out = `${___NS__times(verticalLength)
+                                .map(() => labelReplacementCode.backendCode + '\n')
+                                .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() === TAGS.BACKEND.toLowerCase()) {
+                            out = `${___NS__times(verticalLength)
+                                .map(() => labelReplacementCode.backendCode + '\n')
+                                .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() === TAGS.NOT_FOR_NPM.toLowerCase()) {
+                            out = `${___NS__times(verticalLength)
+                                .map(() => labelReplacementCode.notForNpmCode + '\n')
+                                .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() === TAGS.BROWSER.toLowerCase()) {
+                            out = `${___NS__times(verticalLength)
+                                .map(() => labelReplacementCode.browserCode + '\n')
+                                .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() === TAGS.WEBSQL_ONLY.toLowerCase()) {
+                            out = `${___NS__times(verticalLength)
+                                .map(() => labelReplacementCode.backendCode + '\n')
+                                .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() === TAGS.BACKEND_FUNC.toLowerCase()) {
+                            let spacesPrevious = previous.search(/\S/);
+                            spacesPrevious = spacesPrevious < 0 ? 0 : spacesPrevious;
+                            out =
+                                `${___NS__times(verticalLength)
+                                    .map(() => labelReplacementCode.backendCode + '\n')
+                                    .join('')}` +
+                                    `${___NS__times(spacesPrevious)
+                                        .map(n => ' ')
+                                        .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() === TAGS.WEBSQL_FUNC.toLowerCase()) {
+                            let spacesPrevious = previous.search(/\S/);
+                            spacesPrevious = spacesPrevious < 0 ? 0 : spacesPrevious;
+                            out =
+                                `${___NS__times(verticalLength)
+                                    .map(() => labelReplacementCode.backendCode + '\n')
+                                    .join('')}` +
+                                    `${___NS__times(spacesPrevious)
+                                        .map(n => ' ')
+                                        .join('')}  ${out}`;
+                        }
+                        if (regionTag.toLowerCase() ===
+                            TAGS.CUT_CODE_IF_TRUE.toLowerCase() ||
+                            regionTag.toLowerCase() === TAGS.CUT_CODE_IF_FALSE.toLowerCase()) {
+                            const fn = out; // as ReturnType<typeof codeCuttFn>;
+                            let expressionToExecute = regionOrString.titleString;
+                            // Helpers__NS__log(`LINE: "${regionOrString.lineStart}"`);
+                            expressionToExecute = expressionToExecute.replace(regionTag, '');
+                            // Helpers__NS__log(`Expresion to evaluate "${expressionToExecute}"`);
+                            // Helpers__NS__log(`this.project "${this.project.name}"`);
+                            const configForProject = this.project && this.project.env.config;
+                            // Helpers__NS__log(`configForProject "${configForProject}"`);
+                            const cutCode = fn(expressionToExecute, configForProject, this.realtiveOrAbsFilePAth);
+                            // Helpers__NS__info(`Cut code: "${cutCode}"`);
+                            if (cutCode === null) {
+                                continue;
+                            }
+                            if ((cutCode &&
+                                regionTag.toLowerCase() ===
+                                    TAGS.CUT_CODE_IF_TRUE.toLowerCase()) ||
+                                (!cutCode &&
+                                    regionTag.toLowerCase() ===
+                                        TAGS.CUT_CODE_IF_FALSE.toLowerCase())) {
+                                out = '';
+                            }
+                            else {
+                                continue;
+                            }
+                        }
+                        regionOrString.tmpOutput = out;
+                        break;
+                    }
+                }
+                //#endregion
+            }
+            const res = regionOrString.toString();
+            previous = res;
+            return res;
+        })
+            .join('\n');
+        return this.tmpOutput;
+    }
+    get project() {
+        return this.context.project;
+    }
+    get realtiveOrAbsFilePAth() {
+        return this.context.realtiveOrAbsFilePAth;
+    }
 }
-export {
-  Region
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomorphic-region-loader",
-  "version": "21.0.27",
+  "version": "21.0.29",
   "scripts": {
     "taon init": "taon init",
     "taon start": "taon start",

package/websql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomorphic-region-loader/websql",
-  "version": "21.0.27",
+  "version": "21.0.29",
   "peerDependencies": {
     "@angular/common": "^21.0.0",
     "@angular/core": "^21.0.0"