@squiz/render-runtime-lib 1.2.1-alpha.63 → 1.2.1-alpha.70

package/lib/migrations/20220704054051_initial.sql

@@ -0,0 +1,17 @@
+-- CreateTable
+CREATE TABLE "component" (
+    "name" VARCHAR(128) NOT NULL,
+
+    CONSTRAINT "component_pkey" PRIMARY KEY ("name")
+);
+
+-- CreateTable
+CREATE TABLE "component_version" (
+    "component_name" VARCHAR(128) NOT NULL,
+    "version" VARCHAR(128) NOT NULL,
+
+    CONSTRAINT "component_version_pkey" PRIMARY KEY ("component_name","version")
+);
+
+-- AddForeignKey
+ALTER TABLE "component_version" ADD CONSTRAINT "component_version_component_name_fkey" FOREIGN KEY ("component_name") REFERENCES "component"("name") ON DELETE CASCADE ON UPDATE CASCADE;

package/lib/test/helpers/fixtures.d.ts

@@ -1,6 +1,17 @@
 import { ExecuteComponentTask } from '@squiz/component-lib';
+declare type ComponentReturn = string | object;
 export declare class ComponentFixture {
-    static fixtureDirectory: string;
+    static fixtureRootDirectory: string | undefined;
+    protected static getFixtureRootDirectory(): string;
+    static setupFullComponentDirectory(returnObj: ComponentReturn): Promise<{
+        fixtureDirectory: string;
+        version: string;
+        componentName: string;
+    }>;
     static new(returnObj: string | object): Promise<ExecuteComponentTask>;
     static updateComponent(component: ExecuteComponentTask, output: string | object): Promise<ExecuteComponentTask>;
+    private static createFixtureDirectory;
+    private static createVersionDirectory;
+    private static createManifest;
 }
+export {};

package/lib/test/helpers/stack.d.ts

@@ -1,2 +1,4 @@
+import supertest from 'supertest';
 import { type RenderRuntimeConfig } from '../../';
-export declare const testConfig: RenderRuntimeConfig;
+export declare function getTestConfig(port: number): RenderRuntimeConfig;
+export declare function getTestServer(): supertest.SuperTest<supertest.Test>;

package/lib/test/index.d.ts

@@ -0,0 +1,2 @@
+export * from './helpers/fixtures';
+export * from './helpers/stack';

package/lib/utils/convertFunctionStaticFilesToFqdn.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/getManifestPath.d.ts

@@ -0,0 +1 @@
+export declare function getManifestPath(componentName: string, version: string, isInProductionMode: boolean): Promise<string>;

package/lib/utils/getManifestPath.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/isInProductionMode.d.ts

@@ -0,0 +1 @@
+export declare function isInProductionMode(): boolean;

package/lib/utils/isInProductionMode.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/webserver/app.d.ts

@@ -1,2 +1,3 @@
 import { type Express } from 'express';
-export declare function setupApp(): Express;
+import { ConnectionManager } from '@squiz/component-db-lib';
+export declare function setupApp(db?: ConnectionManager): Express;

package/lib/webserver/controllers/test/definition-route-tests.d.ts

@@ -0,0 +1 @@
+export declare function definitionRouteTests(rootUrl: string, accessingUrl: string): void;

package/lib/webserver/controllers/test/render-route-tests.d.ts

@@ -0,0 +1 @@
+export declare function renderRouteTests(rootUrl: string, accessingUrl: string): void;

package/lib/webserver/controllers/test/static-route-tests.d.ts

@@ -0,0 +1 @@
+export declare function staticRouteTests(url: string): void;

package/lib/webserver/index.d.ts

@@ -1,15 +1,17 @@
 /// <reference types="node" />
 import { type Server } from 'http';
+import { ConnectionManager } from '@squiz/component-db-lib';
 export interface WebserverConfig {
     port?: number;
     rootUrl: string;
+    shouldRunMigrations: boolean;
 }
 export declare class Webserver {
     private static singleton;
     private static config;
     static get(): Server;
     static getConfig(): WebserverConfig;
-    static start(config: WebserverConfig): Promise<Server>;
+    static start(config: WebserverConfig, db?: ConnectionManager): Promise<Server>;
     static stop(): void;
     private static mergeConfig;
 }

package/lib/worker/bridge.js

@@ -102,6 +102,8 @@ const thisErrorCaptureStackTrace = Error.captureStackTrace;
 
 const thisSymbolToString = Symbol.prototype.toString;
 const thisSymbolToStringTag = Symbol.toStringTag;
+const thisSymbolIterator = Symbol.iterator;
+const thisSymbolNodeJSUtilInspectCustom = Symbol.for('nodejs.util.inspect.custom');
 
 /**
  * VMError.
@@ -348,7 +350,11 @@ function createBridge(otherInit, registerProxy) {
 		constructor(object) {
 			// Note: object@other(unsafe) throws@this(unsafe)
 			super();
-			this.object = object;
+			this.objectWrapper = () => object;
+		}
+
+		getObject() {
+			return this.objectWrapper();
 		}
 
 		getFactory() {
@@ -408,7 +414,7 @@ function createBridge(otherInit, registerProxy) {
 
 		get(target, key, receiver) {
 			// Note: target@this(unsafe) key@prim receiver@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			switch (key) {
 				case 'constructor': {
 					const desc = otherSafeGetOwnPropertyDescriptor(object, key);
@@ -447,7 +453,7 @@ function createBridge(otherInit, registerProxy) {
 
 		set(target, key, value, receiver) {
 			// Note: target@this(unsafe) key@prim value@this(unsafe) receiver@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			if (key === '__proto__' && !thisOtherHasOwnProperty(object, key)) {
 				return this.setPrototypeOf(target, value);
 			}
@@ -471,7 +477,7 @@ function createBridge(otherInit, registerProxy) {
 
 		apply(target, context, args) {
 			// Note: target@this(unsafe) context@this(unsafe) args@this(safe-array) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			let ret; // @other(unsafe)
 			try {
 				context = otherFromThis(context);
@@ -485,7 +491,7 @@ function createBridge(otherInit, registerProxy) {
 
 		construct(target, args, newTarget) {
 			// Note: target@this(unsafe) args@this(safe-array) newTarget@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			let ret; // @other(unsafe)
 			try {
 				args = otherFromThisArguments(args);
@@ -498,14 +504,14 @@ function createBridge(otherInit, registerProxy) {
 
 		getOwnPropertyDescriptorDesc(target, prop, desc) {
 			// Note: target@this(unsafe) prop@prim desc@other{safe} throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			if (desc && typeof object === 'function' && (prop === 'arguments' || prop === 'caller' || prop === 'callee')) desc.value = null;
 			return desc;
 		}
 
 		getOwnPropertyDescriptor(target, prop) {
 			// Note: target@this(unsafe) prop@prim throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			let desc; // @other(safe)
 			try {
 				desc = otherSafeGetOwnPropertyDescriptor(object, prop);
@@ -551,7 +557,7 @@ function createBridge(otherInit, registerProxy) {
 
 		defineProperty(target, prop, desc) {
 			// Note: target@this(unsafe) prop@prim desc@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			if (!thisReflectSetPrototypeOf(desc, null)) throw thisUnexpected();
 
 			desc = this.definePropertyDesc(target, prop, desc);
@@ -604,7 +610,7 @@ function createBridge(otherInit, registerProxy) {
 
 		deleteProperty(target, prop) {
 			// Note: target@this(unsafe) prop@prim throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			try {
 				return otherReflectDeleteProperty(object, prop) === true;
 			} catch (e) { // @other(unsafe)
@@ -614,7 +620,7 @@ function createBridge(otherInit, registerProxy) {
 
 		has(target, key) {
 			// Note: target@this(unsafe) key@prim throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			try {
 				return otherReflectHas(object, key) === true;
 			} catch (e) { // @other(unsafe)
@@ -624,7 +630,7 @@ function createBridge(otherInit, registerProxy) {
 
 		isExtensible(target) {
 			// Note: target@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			try {
 				if (otherReflectIsExtensible(object)) return true;
 			} catch (e) { // @other(unsafe)
@@ -638,7 +644,7 @@ function createBridge(otherInit, registerProxy) {
 
 		ownKeys(target) {
 			// Note: target@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			let res; // @other(unsafe)
 			try {
 				res = otherReflectOwnKeys(object);
@@ -650,7 +656,7 @@ function createBridge(otherInit, registerProxy) {
 
 		preventExtensions(target) {
 			// Note: target@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			try {
 				if (!otherReflectPreventExtensions(object)) return false;
 			} catch (e) { // @other(unsafe)
@@ -664,7 +670,7 @@ function createBridge(otherInit, registerProxy) {
 
 		enumerate(target) {
 			// Note: target@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			let res; // @other(unsafe)
 			try {
 				res = otherReflectEnumerate(object);
@@ -676,6 +682,10 @@ function createBridge(otherInit, registerProxy) {
 
 	}
 
+	BaseHandler.prototype[thisSymbolNodeJSUtilInspectCustom] = undefined;
+	BaseHandler.prototype[thisSymbolToStringTag] = 'VM2 Wrapper';
+	BaseHandler.prototype[thisSymbolIterator] = undefined;
+
 	function defaultFactory(object) {
 		// Note: other@other(unsafe) returns@this(unsafe) throws@this(unsafe)
 		return new BaseHandler(object);
@@ -773,7 +783,7 @@ function createBridge(otherInit, registerProxy) {
 
 		get(target, key, receiver) {
 			// Note: target@this(unsafe) key@prim receiver@this(unsafe) throws@this(unsafe)
-			const object = this.object; // @other(unsafe)
+			const object = this.getObject(); // @other(unsafe)
 			const mock = this.mock;
 			if (thisReflectApply(thisObjectHasOwnProperty, mock, key) && !thisOtherHasOwnProperty(object, key)) {
 				return mock[key];

package/lib/worker/setup-node-sandbox.js

@@ -330,6 +330,8 @@ function process() {
 	return this;
 }
 
+const baseUptime = localProcess.uptime();
+
 // FIXME wrong class structure
 global.process = {
 	__proto__: process.prototype,
@@ -354,6 +356,9 @@ global.process = {
 	hrtime: function hrtime(time) {
 		return localProcess.hrtime(time);
 	},
+	uptime: function uptime() {
+		return localProcess.uptime() - baseUptime;
+	},
 	cwd: function cwd() {
 		return localProcess.cwd();
 	},

package/lib/worker/setup-sandbox.js

@@ -51,7 +51,10 @@ const {
 	AsyncGeneratorFunction
 } = data;
 
-const localWeakMapGet = LocalWeakMap.prototype.get;
+const {
+	get: localWeakMapGet,
+	set: localWeakMapSet
+} = LocalWeakMap.prototype;
 
 function localUnexpected() {
 	return new VMError('Should not happen');
@@ -282,8 +285,8 @@ if (typeof OriginalCallSite === 'function') {
 				}
 				return value(error, sst);
 			};
-			wrappedPrepareStackTrace.set(value, newWrapped);
-			wrappedPrepareStackTrace.set(newWrapped, newWrapped);
+			localReflectApply(localWeakMapSet, wrappedPrepareStackTrace, [value, newWrapped]);
+			localReflectApply(localWeakMapSet, wrappedPrepareStackTrace, [newWrapped, newWrapped]);
 			currentPrepareStackTrace = newWrapped;
 		}
 	})) throw localUnexpected();

package/lib/worker/transformer.js

@@ -51,6 +51,10 @@ function transformer(args, body, isAsync, isGenerator, filename) {
 	let argsOffset;
 	if (args === null) {
 		code = body;
+		// Note: Keywords are not allows to contain u escapes
+		if (!/\b(?:catch|import|async)\b/.test(code)) {
+			return {__proto__: null, code, hasAsync: false};
+		}
 	} else {
 		code = isAsync ? '(async function' : '(function';
 		if (isGenerator) code += '*';