@itrocks/template 0.1.6 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/cjs/template.d.ts CHANGED
@@ -26,8 +26,8 @@ export declare class HtmlResponse {
26
26
  toString(): string;
27
27
  }
28
28
  export declare class Template {
29
- data?: any;
30
- containerData?: any;
29
+ data?: any | undefined;
30
+ containerData?: any | undefined;
31
31
  blockBack: number;
32
32
  blockStack: BlockStackEntry[];
33
33
  doExpression: boolean;
@@ -64,7 +64,7 @@ export declare class Template {
64
64
  onTagClose?: (name: string) => void;
65
65
  parsers: VariableParser[];
66
66
  prefixes: string;
67
- constructor(data?: any, containerData?: any);
67
+ constructor(data?: any | undefined, containerData?: any | undefined);
68
68
  applyLiterals(text: string, parts?: string[]): string;
69
69
  closeTag(shouldInLiteral: boolean, targetIndex: number): boolean;
70
70
  combineLiterals(text: string, parts?: string[]): string;
package/cjs/template.js CHANGED
@@ -265,7 +265,9 @@ class Template {
265
265
  if (link[0] === '/')
266
266
  return link;
267
267
  const result = (0, node_path_1.normalize)(this.filePath + node_path_2.sep + link).substring(app_dir_1.appDir.length);
268
- return (node_path_2.sep === '/') ? result : result.replaceAll(node_path_2.sep, '/');
268
+ return (((node_path_2.sep === '/') ? result : result.replaceAll(node_path_2.sep, '/')))
269
+ .replace(/^\/node_modules\/@itrocks\//, '/@itrocks/')
270
+ .replace(/^\/node_modules\//, '/lib/');
269
271
  }
270
272
  async parseBuffer(buffer) {
271
273
  this.prefixes = this.parsers.map(([prefix]) => prefix).join('');
@@ -499,8 +501,13 @@ class Template {
499
501
  return await callback(variable, data);
500
502
  }
501
503
  }
502
- if (data[variable] === undefined) {
503
- data = new rename_1.Str(await exports.depends.toString(data));
504
+ if (((typeof data)[0] === 'o') ? !(variable in data) : (variable[data] === undefined)) {
505
+ const asStr = new rename_1.Str(await exports.depends.toString(data));
506
+ if (DEBUG)
507
+ console.log('is', variable, 'in', asStr, '?');
508
+ if (variable in asStr) {
509
+ data = asStr;
510
+ }
504
511
  }
505
512
  let value = data[variable];
506
513
  return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))
package/esm/template.d.ts CHANGED
@@ -26,8 +26,8 @@ export declare class HtmlResponse {
26
26
  toString(): string;
27
27
  }
28
28
  export declare class Template {
29
- data?: any;
30
- containerData?: any;
29
+ data?: any | undefined;
30
+ containerData?: any | undefined;
31
31
  blockBack: number;
32
32
  blockStack: BlockStackEntry[];
33
33
  doExpression: boolean;
@@ -64,7 +64,7 @@ export declare class Template {
64
64
  onTagClose?: (name: string) => void;
65
65
  parsers: VariableParser[];
66
66
  prefixes: string;
67
- constructor(data?: any, containerData?: any);
67
+ constructor(data?: any | undefined, containerData?: any | undefined);
68
68
  applyLiterals(text: string, parts?: string[]): string;
69
69
  closeTag(shouldInLiteral: boolean, targetIndex: number): boolean;
70
70
  combineLiterals(text: string, parts?: string[]): string;
package/esm/template.js CHANGED
@@ -260,7 +260,9 @@ export class Template {
260
260
  if (link[0] === '/')
261
261
  return link;
262
262
  const result = normalize(this.filePath + sep + link).substring(appDir.length);
263
- return (sep === '/') ? result : result.replaceAll(sep, '/');
263
+ return (((sep === '/') ? result : result.replaceAll(sep, '/')))
264
+ .replace(/^\/node_modules\/@itrocks\//, '/@itrocks/')
265
+ .replace(/^\/node_modules\//, '/lib/');
264
266
  }
265
267
  async parseBuffer(buffer) {
266
268
  this.prefixes = this.parsers.map(([prefix]) => prefix).join('');
@@ -494,8 +496,13 @@ export class Template {
494
496
  return await callback(variable, data);
495
497
  }
496
498
  }
497
- if (data[variable] === undefined) {
498
- data = new Str(await depends.toString(data));
499
+ if (((typeof data)[0] === 'o') ? !(variable in data) : (variable[data] === undefined)) {
500
+ const asStr = new Str(await depends.toString(data));
501
+ if (DEBUG)
502
+ console.log('is', variable, 'in', asStr, '?');
503
+ if (variable in asStr) {
504
+ data = asStr;
505
+ }
499
506
  }
500
507
  let value = data[variable];
501
508
  return (((typeof value)[0] === 'f') && ((value + '')[0] !== 'c'))
package/package.json CHANGED
@@ -69,5 +69,5 @@
69
69
  "test": "test/test"
70
70
  },
71
71
  "types": "./esm/template.d.ts",
72
- "version": "0.1.6"
72
+ "version": "0.2.0"
73
73
  }