@platforma-sdk/tengo-builder 1.17.4 → 1.17.5

package/src/compiler/template.ts

@@ -1,69 +1,17 @@
-import { gunzipSync, gzipSync } from 'node:zlib';
-import canonicalize from 'canonicalize';
-import {
+import type {
   CompileMode,
   FullArtifactName,
   FullArtifactNameWithoutType,
+} from './package';
+import {
   fullNameWithoutTypeToString,
-  parseArtefactNameAndVersion
+  parseArtefactNameAndVersion,
 } from './package';
-
-export interface TemplateLibData {
-  /** i.e. @milaboratory/some-package:lib1 */
-  name: string;
-  /** i.e. 1.2.3 */
-  version: string;
-  /** full source code */
-  src: string,
-}
-
-export interface TemplateSoftwareData {
-  /** i.e. @milaboratory/mixcr:main */
-  name: string;
-  /** i.e. 4.2.3 */
-  version: string;
-  /** full contents of software dependency description */
-  src: string,
-}
-
-export interface TemplateAssetData {
-  /** i.e. @milaboratory/mixcr:main */
-  name: string;
-  /** i.e. 4.2.3 */
-  version: string;
-  /** full contents of asset dependency description */
-  src: string,
-}
-
-export interface TemplateData {
-  /** Discriminator for future use */
-  type: 'pl.tengo-template.v2';
-
-  /** i.e. @milaboratory/some-package:template */
-  name: string;
-  /** i.e. 1.2.3 */
-  version: string;
-
-  /**
-   * Custom hash token of the template for deduplication purposes. Can be set with 'hash_override' compiler option.
-   * Dangerous! Remember: great power comes with great responsibility.
-   */
-  hashOverride?: string;
-
-  /** i.e. @milaboratory/some-package:some-lib -> normalized library source code */
-  libs: Record<string, TemplateLibData>;
-  /** i.e. @milaboratory/some-package:some-lib -> to nested template data */
-  templates: Record<string, TemplateData>;
-  /** i.e. @milaboratory/mixcr:main -> software metadata */
-  software: Record<string, TemplateSoftwareData>;
-  /** i.e. @milaboratory/genome:human -> asset metadata */
-  assets: Record<string, TemplateAssetData>;
-  /** Template source code */
-  src: string;
-}
-
-const decoder = new TextDecoder();
-const encoder = new TextEncoder();
+import type { TemplateData } from '@milaboratories/pl-model-backend';
+import {
+  parseTemplate,
+  serializeTemplate,
+} from '@milaboratories/pl-model-backend';
 
 export class Template {
   public readonly data: TemplateData;
@@ -73,9 +21,9 @@ export class Template {
     public readonly compileMode: CompileMode,
     public readonly fullName: FullArtifactName,
     body: {
-      data?: TemplateData,
-      content?: Uint8Array
-    }
+      data?: TemplateData;
+      content?: Uint8Array;
+    },
   ) {
     let { data, content } = body;
     if (data === undefined && content === undefined)
@@ -83,25 +31,25 @@ export class Template {
     if (data !== undefined && content !== undefined)
       throw new Error('Both data and content are provided for template constructor');
 
-    if (data === undefined) {
-      data = JSON.parse(decoder.decode(gunzipSync(content!))) as TemplateData;
-      if (data.type !== 'pl.tengo-template.v2')
-        throw new Error('malformed template');
-    }
-
-    if (content === undefined)
-      content = gzipSync(encoder.encode(canonicalize(data!)), { chunkSize: 256 * 1024, level: 9 });
+    if (data === undefined) data = parseTemplate(content!);
+    if (content === undefined) content = serializeTemplate(data);
 
     const nameFromData: FullArtifactNameWithoutType = parseArtefactNameAndVersion(data);
 
-    if (nameFromData.pkg !== fullName.pkg || nameFromData.id !== fullName.id || nameFromData.version !== fullName.version)
-      throw new Error(`Compiled template name don't match it's package and file names: ${fullNameWithoutTypeToString(nameFromData)} != ${fullNameWithoutTypeToString(fullName)}`);
+    if (
+      nameFromData.pkg !== fullName.pkg
+      || nameFromData.id !== fullName.id
+      || nameFromData.version !== fullName.version
+    )
+      throw new Error(
+        `Compiled template name don't match it's package and file names: ${fullNameWithoutTypeToString(nameFromData)} != ${fullNameWithoutTypeToString(fullName)}`,
+      );
 
     this.data = data;
     this.content = content;
   }
 
   toJSON() {
-    return { compileMode: this.compileMode, fullName: this.fullName, data: this.data }
+    return { compileMode: this.compileMode, fullName: this.fullName, data: this.data };
   }
 }

package/src/index.ts

@@ -20,5 +20,5 @@ export const COMMANDS = {
   'dump:libs': Cmd5,
   'dump:software': Cmd6,
   'dump:templates': Cmd7,
-  'dump:tests': Cmd8
+  'dump:tests': Cmd8,
 };