lucy-cli 1.0.15 → 1.1.0

package/.stylelintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  overrides: [
+    {
+      files: ["**/*.{ts,tsx}"],
+      customSyntax: "@stylelint/postcss-css-in-js",
+    },
+  ],
+};

package/dist/Gulpfile.d.ts

@@ -18,6 +18,7 @@ export type TaskOptions = {
     publicSettings: typeof publicSettings;
     modulesSync: Record<string, string> | undefined;
     cwd: string;
+    isWatching?: boolean;
 };
 export interface File {
     path: string;

package/dist/Gulpfile.js

@@ -45,6 +45,7 @@ const taskOptions = {
     cwd: process.cwd(),
     modulesSync: getModulesSync(),
 };
+const watchTaskOptions = { ...taskOptions, isWatching: true };
 gulp.task('check-ts', gulp.parallel(checkTs(taskOptions)));
 gulp.task('scss', gulp.parallel(compileScss(taskOptions)));
 gulp.task('build-backend', gulp.parallel(buildBackend(taskOptions), buildBackendJSW(taskOptions)));
@@ -58,6 +59,13 @@ gulp.task('test', function () {
         console.log("💩" + red.underline.bold(' => Error in test task!'));
     });
 });
+gulp.task('test-ci', function () {
+    return shell.task(['yarn test --run'], { ignoreErrors: true })().then(() => {
+        console.log("🐕" + blue.underline.bold(' => Exited test task!'));
+    }).catch(err => {
+        console.log("💩" + red.underline.bold(' => Error in test task!'));
+    });
+});
 gulp.task('sync-types', shell.task([
     'yarn postinstall',
 ]));
@@ -74,11 +82,9 @@ gulp.task('gen-docs', shell.task([
 ]));
 gulp.task('fix-wix', gulp.series(cleanWix(), 'sync-types', 'fix-wixtypes', 'add-wix-types'));
 gulp.task('build', gulp.parallel('build-backend', 'build-public', 'preview-templates', buildPages(taskOptions), compileScss(taskOptions), 'copy-files'));
-gulp.task('build-pipeline', gulp.series(cleanSrc(taskOptions), 'set-production', 'fix-wixtypes', 'add-wix-types', 
-// 'test',
-'build'));
-gulp.task('build-prod', gulp.series((done) => checkPages(true, false).then(() => done(), (err) => done(err)), cleanSrc(taskOptions), 'set-production', 'fix-wix', 'build-backend', 'build-public', buildPages(taskOptions), 'copy-files', compileScss(taskOptions)));
-gulp.task('start-dev-env', gulp.parallel(watchAll(taskOptions), 'test', 'start-wix', (done) => checkPages(false, taskOptions.moduleSettings?.force ?? false).then(() => done(), (err) => done(err))));
+gulp.task('build-pipeline', gulp.series(cleanSrc(taskOptions), 'set-production', 'check-ts', 'fix-wixtypes', 'add-wix-types', 'test-ci', 'build'));
+gulp.task('build-prod', gulp.series((done) => checkPages(true, false).then(() => done(), (err) => done(err)), cleanSrc(taskOptions), 'set-production', 'fix-wix', 'check-ts', 'test-ci', 'build-backend', 'build-public', buildPages(taskOptions), 'copy-files', compileScss(taskOptions)));
+gulp.task('start-dev-env', gulp.parallel(watchAll(watchTaskOptions), 'test', 'start-wix', 'check-ts', (done) => checkPages(false, taskOptions.moduleSettings?.force ?? false).then(() => done(), (err) => done(err))));
 gulp.task('dev', gulp.series(cleanSrc(taskOptions), 'fix-wix', 'build', 'start-dev-env'));
 async function gulpTaskRunner(task) {
     return new Promise(function (resolve, reject) {

package/dist/gulp/checks.js

@@ -149,6 +149,27 @@ export async function checkPages(fail, force) {
         }
     });
 }
+const customReporter = {
+    error: (error, tsInstance) => {
+        if (!error.diagnostic) {
+            console.log(red(error.message));
+            return;
+        }
+        const { fullFilename, startPosition } = error;
+        const relativePath = path.relative(process.cwd(), fullFilename ?? '');
+        const line = startPosition ? startPosition.line + 1 : 0;
+        const col = startPosition ? startPosition.character + 1 : 0;
+        const message = tsInstance.flattenDiagnosticMessageText(error.diagnostic.messageText, '\n');
+        console.log(`${blue.underline(relativePath)}:${yellow(String(line))}:${yellow(String(col))}`);
+        console.log(`  ${red('error')} ${yellow(`TS${error.diagnostic.code}`)}: ${message}`);
+    },
+    finish: (results) => {
+        const errorCount = results.transpileErrors + results.semanticErrors + results.declarationErrors;
+        if (errorCount > 0) {
+            console.log(`\n💥 ${red.bold(`Found ${errorCount} error${errorCount > 1 ? 's' : ''}.`)}`);
+        }
+    },
+};
 export function checkTs(options) {
     const folders = ['typescript'];
     if (options.modulesSync) {
@@ -158,18 +179,27 @@ export function checkTs(options) {
     }
     // Create tasks for each folder
     const tasks = folders.map((folder) => {
-        const tsProject = ts.createProject(`./${folder}/tsconfig.json`, { noEmit: true });
+        const tsProject = ts.createProject(`./local.tsconfig.json`, { noEmit: true, declaration: false, skipDefaultLibCheck: true });
         const taskName = `test-${folder}`; // Create a unique name for each task
-        const task = () => gulp.src([`${folder}/**/*.ts`, `!${folder}/types/**/*.ts`], { cwd: folder })
-            .pipe(tsProject(ts.reporter.fullReporter(true)))
-            .on('error', function (e) {
-            console.log("💩" + red.underline.bold(` => Typescriptcheck for ${orange(folder)} failed!`));
-            console.log("💩" + red.underline.bold(` => Error: ${orange(e.message)}`));
-            this.emit('end');
-        })
-            .on('end', function () {
-            console.log("🐶" + blue.underline(` => Typescriptcheck for ${orange(folder)} succeeded!`));
-        });
+        const task = () => {
+            let hasError = false;
+            const stream = gulp.src([`${folder}/**/*.ts`, `!${folder}/types/**/*.ts`])
+                .pipe(tsProject(customReporter))
+                .on('error', () => {
+                hasError = true;
+            });
+            if (options.isWatching) {
+                stream.on('error', function () {
+                    this.emit('end');
+                });
+            }
+            stream.on('end', () => {
+                if (!hasError) {
+                    console.log("🐶" + blue.underline(` => Typescriptcheck for ${orange(folder)} succeeded!`));
+                }
+            });
+            return stream;
+        };
         // Register the task with Gulp
         Object.defineProperty(task, 'name', { value: taskName }); // Set a unique name for debugging
         return task;

package/dist/gulp/types.js

@@ -19,6 +19,7 @@ export function updateWixTypes(options) {
         // Add module to publicSettings
         publicSettings.compilerOptions.paths['backend/*.web'] = ["../../../typescript/backend/*.web.ts"];
         publicSettings.compilerOptions.paths['backend/*.web.js'] = ["../../../typescript/backend/*.web.ts"];
+        publicSettings.compilerOptions.paths['backend/*'] = ["../../../typescript/backend/*.web.ts"];
         publicSettings.compilerOptions.paths['backend/*.jsw'] = ["../../../typescript/backend/*.jsw.ts"];
         publicSettings.compilerOptions.paths.mocks = ["../../../typescript/__mocks__/*"];
         publicSettings.compilerOptions.paths['types/*'] = ["../../../typescript/types/*"];
@@ -43,6 +44,7 @@ export function updateWixTypes(options) {
         // Add module to masterSettings
         masterSettings.compilerOptions.paths['backend/*.web'] = ["../../../typescript/backend/*.web.ts"];
         masterSettings.compilerOptions.paths['backend/*.web.js'] = ["../../../typescript/backend/*.web.ts"];
+        masterSettings.compilerOptions.paths['backend/*'] = ["../../../typescript/backend/*.web.ts"];
         masterSettings.compilerOptions.paths['backend/*.jsw'] = ["../../../typescript/backend/*.jsw.ts"];
         masterSettings.compilerOptions.paths['types/*'] = ["../../../typescript/types/*"];
         masterSettings.include = [
@@ -55,6 +57,7 @@ export function updateWixTypes(options) {
         // Add module to pageSettings
         pageSettings.compilerOptions.paths['backend/*.web'] = ["../../../typescript/backend/*.web.ts"];
         pageSettings.compilerOptions.paths['backend/*.web.js'] = ["../../../typescript/backend/*.web.ts"];
+        pageSettings.compilerOptions.paths['backend/*'] = ["../../../typescript/backend/*.web.ts"];
         pageSettings.compilerOptions.paths['backend/*.jsw'] = ["../../../typescript/backend/*.jsw.ts"];
         pageSettings.compilerOptions.paths['types/*'] = ["../../../typescript/types/*"];
         pageSettings.compilerOptions.paths['backend/*.jsw'] = ["../../../typescript/backend/*.jsw.ts"];
@@ -70,6 +73,7 @@ export function updateWixTypes(options) {
                 // Add module to publicSettings
                 publicSettings.compilerOptions.paths['backend/*.web.js'].push(`../../../${name}/backend/*.web.ts`);
                 publicSettings.compilerOptions.paths['backend/*.web'].push(`../../../${name}/backend/*.web.ts`);
+                publicSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.web.ts`);
                 publicSettings.compilerOptions.paths['backend/*.jsw'].push(`../../../${name}/backend/*.jsw.ts`);
                 publicSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*`);
                 publicSettings.compilerOptions.paths.mocks.push(...[`../../../${name}/__mocks__/*`]);
@@ -97,6 +101,7 @@ export function updateWixTypes(options) {
                 // Add module to masterSettings
                 masterSettings.compilerOptions.paths['backend/*.web.js'].push(`../../../${name}/backend/*.web.ts`);
                 masterSettings.compilerOptions.paths['backend/*.web'].push(`../../../${name}/backend/*.web.ts`);
+                masterSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.web.ts`);
                 masterSettings.compilerOptions.paths['backend/*.jsw'].push(`../../../${name}/backend/*.jsw.ts`);
                 masterSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*`);
                 masterSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*`);
@@ -110,6 +115,7 @@ export function updateWixTypes(options) {
                 // Add module to pageSettings
                 pageSettings.compilerOptions.paths['backend/*.web.js'].push(`../../../${name}/backend/*.web.ts`);
                 pageSettings.compilerOptions.paths['backend/*.web'].push(`../../../${name}/backend/*.web.ts`);
+                pageSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.web.ts`);
                 pageSettings.compilerOptions.paths['backend/*.jsw'].push(`../../../${name}/backend/*.jsw.ts`);
                 pageSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*`);
                 pageSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*`);
@@ -173,26 +179,27 @@ export function updateWixTypes(options) {
 }
 export function addTypes(options, done) {
     const { replaceOptions } = options;
-    // const processPages = gulp.src(['./.wix/types/wix-code-types/dist/types/page/$w.d.ts'])
-    // 	.pipe(replace('declare namespace \\$w {', ' declare namespace $w{\nconst api: $w.Api;\n', replaceOptions))
-    // 	.pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/page/'));
+    // Regex to match keywords at the beginning of a line, capturing any leading whitespace.
+    // The 'm' flag is for multiline matching (^ matches start of line).
+    // The 'g' flag is for global matching (replace all instances).
+    const interfaceRegex = /^(\s*)interface\s/gm;
+    const enumRegex = /^(\s*)enum\s/gm;
+    const typeRegex = /^(\s*)type\s/gm;
     const exportTypes = gulp.src(['./.wix/types/wix-code-types/dist/types/common/*.d.ts', '!./.wix/types/wix-code-types/dist/types/common/$w.d.ts'])
-        .pipe(replace('interface ', 'export interface ', replaceOptions))
-        .pipe(replace('enum ', 'export enum ', replaceOptions))
-        .pipe(replace('type ', 'export type ', replaceOptions))
+        // The replacement string '$1export...' uses the captured whitespace to preserve indentation.
+        .pipe(replace(interfaceRegex, 'export interface ', replaceOptions))
+        .pipe(replace(enumRegex, 'export enum ', replaceOptions))
+        .pipe(replace(typeRegex, 'export type ', replaceOptions))
         .pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/common/'));
     const exportTypesBeta = gulp.src(['./.wix/types/wix-code-types/dist/types/beta/common/*.d.ts', '!./.wix/types/wix-code-types/dist/types/beta/common/$w.d.ts'])
-        .pipe(replace('interface ', 'export interface ', replaceOptions))
-        .pipe(replace('enum ', 'export enum ', replaceOptions))
-        .pipe(replace('type ', 'export type ', replaceOptions))
+        .pipe(replace(interfaceRegex, '$1export interface ', replaceOptions))
+        .pipe(replace(enumRegex, 'export enum ', replaceOptions))
+        .pipe(replace(typeRegex, 'export type ', replaceOptions))
         .pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/beta/common/'));
     const processCommon = gulp.src(['./.wix/types/wix-code-types/dist/types/common/$w.d.ts'])
         .pipe(insert.prepend("import '@total-typescript/ts-reset';\n"))
-        // .pipe(replace('namespace \\$w {', 'declare namespace $w{\ntype Api = FrontendAPI;\n', replaceOptions))
         .pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/common/'));
-    return merge(
-    // processPages,
-    processCommon, exportTypesBeta, exportTypes)
+    return merge(processCommon, exportTypesBeta, exportTypes)
         .on('error', function (e) {
         console.log("💩" + red.underline.bold(' => Updating WIX failed!'));
         console.log("💩" + red.underline.bold(` => Error: ${orange(e.message)}`));

package/files/local.tsconfig.json

@@ -10,9 +10,10 @@
     "moduleResolution": "Node",
     "preserveConstEnums": true,
     "allowSyntheticDefaultImports": true,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "allowJs": true,
-    "declaration": true,
+    "declaration": false,
+    "noEmit": true,
     "jsx": "react",
     "strict": true,
     "alwaysStrict": false,
@@ -20,7 +21,7 @@
     "noImplicitReturns": true,
     "noImplicitThis": true,
     "strictNullChecks": true,
-    "exactOptionalPropertyTypes": true,
+    "exactOptionalPropertyTypes": false,
     "strictBindCallApply": true,
     "strictFunctionTypes": true,
     "strictPropertyInitialization": true,
@@ -34,18 +35,24 @@
       }
     ],
     "paths": {
-      "public/*": ["./typescript/public/*", "./lib/public/*"],
-      "backend/*": ["./typescript/backend/*", "./lib/backend/*"],
-      "pages/*": ["./pages/*"],
-      "types/*": ["./types/*"]
+      "public/*": ["./typescript/public/*"],
+      "backend/*": ["./typescript/backend/*"],
+      "pages/*": ["./typescript/pages/*"],
+      "types/*": ["./typescript/types/*"]
     },
-    "typeRoots": ["./types", "../node_modules/@types"]
+    "typeRoots": [
+      "./types",
+      ".wix/types/wix-code-types/dist/types/backend",
+      ".wix/types/wix-code-types/dist/types/common",
+      ".wix/types/wix-code-types/dist/types/public",
+      ".wix/types/wix-code-types/dist/types/page",
+      ".wix/types/masterPage",
+      "node_modules/@types"
+    ]
   },
   "exclude": [
     "../node_modules",
-    "../.wix",
     "node_modules",
-    "./wix",
     "./**/*.test.ts",
     "../src/**/*"
   ],

package/files/typescript/tsconfig.json

@@ -3,26 +3,49 @@
         "enable": true
     },
     "compilerOptions": {
-        "outDir": "../src",
-        "rootDir": ".",
-        "target": "ES2020",
+        // --- Path and Module Settings ---
         "module": "ES2020",
         "moduleResolution": "Node",
-        "preserveConstEnums": true,
+        "target": "ES2020",
+        "baseUrl": "..",
+        "paths": {
+            "public/*": ["./public/*"],
+            "backend/*": ["./backend/*"],
+            "pages/*": ["./pages/*"],
+            "types/*": ["./types/*"]
+        },
+        "typeRoots": [
+            "./.wix/types",
+            "./typescript/types",
+            "./node_modules/@types"
+        ],
+        "outDir": "./src",
+        "resolveJsonModule": true,
+        "jsx": "react-jsx",
+        "allowJs": false,
+
+        // --- Declaration File Settings (Crucial for this error) ---
+        "declaration": true,
+        "declarationMap": true,
+
+        // --- Strictness and Checks ---
+        "strict": true,
         "allowSyntheticDefaultImports": true,
         "skipLibCheck": true,
-        "declaration": false,
-        "strict": true,
-        "alwaysStrict": false,  
+        "forceConsistentCasingInFileNames": true,
+        "alwaysStrict": false,
         "noImplicitAny": true,
         "noImplicitReturns": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "exactOptionalPropertyTypes": true,
         "strictBindCallApply": true,
         "strictFunctionTypes": true,
         "strictPropertyInitialization": true,
-        "exactOptionalPropertyTypes": true,
-        "noEmit": true,
+
+        // --- Advanced ---
+        "composite": false,
+        "preserveConstEnums": true,
         "plugins": [
             {
                 "name": "@styled/typescript-styled-plugin"
@@ -31,26 +54,19 @@
                 "name": "typescript-eslint-language-service"
             }
         ],
-        "paths": {
-            "public/*": ["./public/*"],
-            "backend/*": ["./backend/*"],
-            "pages/*": ["./pages/*"],
-            "types/*": ["./types/*"]
-        },
-            "typeRoots": [
-                "./types", 
-                "../node_modules/@types"
-            ]
     },
-    "exclude": ["../node_modules", "../.wix", "node_modules", "./wix", "./**/*.spec.ts", "../src/**/*"],
-    "include":[
-        "!*.d.ts",
-        "public/**/*.tsx",
-        "**/*.ts"
+    "include": [
+        "./**/*.ts"
+    ],
+    "exclude": [
+        "../node_modules",
+        "../.wix",
+        "../src",
+        "**/*.spec.ts"
     ],
     "references": [
         {
             "path": "../jsconfig.json"
         }
     ]
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "lucy-cli",
-  "version": "1.0.15",
+  "version": "1.1.0",
   "description": "Lucy Framework for WIX Studio Editor",
   "main": ".dist/index.js",
   "scripts": {

package/settings/backend-settings.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "composite": false,
-    "declaration": false,
+    "noEmit": true,
     "experimentalDecorators": true,
     "noUncheckedIndexedAccess": true,
     "jsx": "react-jsx",

package/settings/master-settings.json

@@ -1,16 +1,16 @@
 {
   "compilerOptions": {
     "strict": true,
-    "strictNullChecks": true,
     "composite": false,
-    "declaration": false,
+    "noEmit": true,
+    "strictNullChecks": true,
     "jsx": "react-jsx",
-    "noEmit": false,
     "noUncheckedIndexedAccess": true,
     "paths": {
       "backend/*.web.js": [],
       "backend/*.web": [],
       "backend/*.jsw": [],
+      "backend/*": [],
       "public/*": [],
       "wix-types/*": ["../wix-code-types/dist/types/*"],
       "types/*": []

package/settings/page-settings.json

@@ -1,17 +1,17 @@
 {
   "compilerOptions": {
-    "composite": false,
-    "declaration": false,
     "strict": true,
     "strictNullChecks": true,
+    "composite": false,
+    "noEmit": true,
     "experimentalDecorators": true,
     "jsx": "react-jsx",
-    "noEmit": false,
     "noUncheckedIndexedAccess": true,
     "paths": {
       "backend/*.web.js": [],
       "backend/*.web": [],
       "backend/*.jsw": [],
+      "backend/*": [],
       "public/*": [],
       "wix-types/*": ["../wix-code-types/dist/types/*"],
       "types/*": []

package/settings/public-settings.json

@@ -1,17 +1,17 @@
 {
   "compilerOptions": {
-    "composite": false,
-    "declaration": false,
     "experimentalDecorators": true,
-    "noEmit": false,
     "noUncheckedIndexedAccess": true,
     "strict": true,
+    "composite": false,
+    "noEmit": true,
     "jsx": "react-jsx",
     "strictNullChecks": true,
     "paths": {
       "backend/*.web.js": [],
       "backend/*.web": [],
       "backend/*.jsw": [],
+      "backend/*": [],
       "mocks": [],
       "public/*": [],
       "types/*": [],

package/src/Gulpfile.ts

@@ -39,6 +39,7 @@ export type TaskOptions = {
 	publicSettings: typeof publicSettings,
 	modulesSync: Record<string, string> | undefined;
 	cwd: string;
+	isWatching?: boolean;
 }
 
 export interface File {
@@ -68,6 +69,8 @@ const taskOptions: TaskOptions = {
 	modulesSync: getModulesSync(),
 }
 
+const watchTaskOptions: TaskOptions = { ...taskOptions, isWatching: true };
+
 gulp.task('check-ts', gulp.parallel( 
 	checkTs(taskOptions),
 ));
@@ -104,6 +107,16 @@ gulp.task('test', function () {
 		console.log("💩" + red.underline.bold(' => Error in test task!'));
 	});
 });
+gulp.task('test-ci', function () {
+	return shell.task(
+		['yarn test --run'],
+		{ ignoreErrors: true }
+	)().then(() => {
+		console.log("🐕" + blue.underline.bold(' => Exited test task!'));
+	}).catch(err => {
+		console.log("💩" + red.underline.bold(' => Error in test task!'));
+	});
+});
 
 gulp.task('sync-types', shell.task([
 	'yarn postinstall',
@@ -149,9 +162,10 @@ gulp.task('build', gulp.parallel(
 gulp.task('build-pipeline', gulp.series(
 	cleanSrc(taskOptions),
 	'set-production',
+	'check-ts',
 	'fix-wixtypes', 
 	'add-wix-types',
-	// 'test',
+	'test-ci',
 	'build',
 ));
 
@@ -160,6 +174,8 @@ gulp.task('build-prod', gulp.series(
 	cleanSrc(taskOptions),
 	'set-production', 
 	'fix-wix', 
+	'check-ts',
+	'test-ci',
 	'build-backend', 
 	'build-public', 
 	buildPages(taskOptions),
@@ -170,9 +186,10 @@ gulp.task('build-prod', gulp.series(
 
 
 gulp.task('start-dev-env', gulp.parallel(
-	watchAll(taskOptions),
+	watchAll(watchTaskOptions),
 	'test',
 	'start-wix',
+	'check-ts',
 	(done) => checkPages(false, taskOptions.moduleSettings?.force ?? false).then(() => done(), (err) => done(err)),
 ));
 

package/src/gulp/backend.ts

@@ -18,7 +18,7 @@ const swcOptions = {
         preserveAllComments: false,
         minify: {
             compress: true // equivalent to {}
-          }
+        }
     },
 };
 

package/src/gulp/checks.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import glob from 'glob';
 
 import * as path from 'path';
+import typescript from 'typescript';
 import gulp from 'gulp';
 import ts from 'gulp-typescript';
 import { blue, green, magenta, orange, red, yellow } from '../index.js';
@@ -158,6 +159,32 @@ export async function checkPages(fail: boolean, force: boolean) {
 	});
 }
 
+const customReporter: ts.reporter.Reporter = {
+	error: (error, tsInstance) => {
+		if (!error.diagnostic) {
+			console.log(red(error.message));
+			return;
+		}
+		const { fullFilename, startPosition } = error;
+		const relativePath = path.relative(process.cwd(), fullFilename ?? '');
+		const line = startPosition ? startPosition.line + 1 : 0;
+		const col = startPosition ? startPosition.character + 1 : 0;
+
+		const message = tsInstance.flattenDiagnosticMessageText(error.diagnostic.messageText, '\n');
+
+		console.log(
+			`${blue.underline(relativePath)}:${yellow(String(line))}:${yellow(String(col))}`
+		);
+		console.log(`  ${red('error')} ${yellow(`TS${error.diagnostic.code}`)}: ${message}`);
+	},
+	finish: (results) => {
+		const errorCount = results.transpileErrors + results.semanticErrors + results.declarationErrors;
+		if (errorCount > 0) {
+			console.log(`\n💥 ${red.bold(`Found ${errorCount} error${errorCount > 1 ? 's' : ''}.`)}`);
+		}
+	},
+};
+
 export function checkTs(options: TaskOptions) {
     const folders = ['typescript'];
     if (options.modulesSync){
@@ -168,22 +195,32 @@ export function checkTs(options: TaskOptions) {
 
     // Create tasks for each folder
     const tasks = folders.map((folder) => {
-		const tsProject = ts.createProject(`./${folder}/tsconfig.json`, { noEmit: true });
+		const tsProject = ts.createProject(`./local.tsconfig.json`, { noEmit: true, declaration: false, skipDefaultLibCheck: true });
 
         const taskName = `test-${folder}`; // Create a unique name for each task
 
-        const task = () =>
-            gulp.src([`${folder}/**/*.ts`, `!${folder}/types/**/*.ts`], { cwd: folder })
-				.pipe(tsProject(ts.reporter.fullReporter(true)))
-                .on('error', function (e: Error) {
-                    console.log("💩" + red.underline.bold(` => Typescriptcheck for ${orange(folder)} failed!`));
-					console.log("💩" + red.underline.bold(` => Error: ${orange(e.message)}`));
+        const task = () => {
+            let hasError = false;
+            const stream = gulp.src([`${folder}/**/*.ts`, `!${folder}/types/**/*.ts`])
+                .pipe(tsProject(customReporter))
+                .on('error', () => {
+                    hasError = true;
+                });
+
+            if (options.isWatching) {
+                stream.on('error', function (this: NodeJS.ReadWriteStream) {
                     this.emit('end');
-                })
-				
-                .on('end', function () {
-                    console.log("🐶" + blue.underline(` => Typescriptcheck for ${orange(folder)} succeeded!`));
                 });
+            }
+
+            stream.on('end', () => {
+                if (!hasError) {
+                    console.log("🐶" + blue.underline(` => Typescriptcheck for ${orange(folder)} succeeded!`));
+                }
+            });
+
+            return stream;
+        };
 
         // Register the task with Gulp
         Object.defineProperty(task, 'name', { value: taskName }); // Set a unique name for debugging

package/src/gulp/types.ts

@@ -25,6 +25,7 @@ export function updateWixTypes(options: TaskOptions) {
 		// Add module to publicSettings
 		publicSettings.compilerOptions.paths['backend/*.web'] = [ "../../../typescript/backend/*.web.ts" ] as never;
 		publicSettings.compilerOptions.paths['backend/*.web.js'] = [ "../../../typescript/backend/*.web.ts" ] as never;
+		publicSettings.compilerOptions.paths['backend/*'] = [ "../../../typescript/backend/*.web.ts" ] as never;
 		publicSettings.compilerOptions.paths['backend/*.jsw'] = [ "../../../typescript/backend/*.jsw.ts" ] as never;
 		publicSettings.compilerOptions.paths.mocks = [ "../../../typescript/__mocks__/*" ] as never;
 		publicSettings.compilerOptions.paths['types/*'] = [ "../../../typescript/types/*" ] as never;
@@ -50,6 +51,7 @@ export function updateWixTypes(options: TaskOptions) {
 		// Add module to masterSettings
 		masterSettings.compilerOptions.paths['backend/*.web'] = [ "../../../typescript/backend/*.web.ts" ] as never;
 		masterSettings.compilerOptions.paths['backend/*.web.js'] = [ "../../../typescript/backend/*.web.ts" ] as never;
+		masterSettings.compilerOptions.paths['backend/*'] = [ "../../../typescript/backend/*.web.ts" ] as never;
 		masterSettings.compilerOptions.paths['backend/*.jsw'] = [ "../../../typescript/backend/*.jsw.ts" ] as never;
 		masterSettings.compilerOptions.paths['types/*'] = [ "../../../typescript/types/*" ] as never;
 		masterSettings.include = [ 
@@ -62,6 +64,7 @@ export function updateWixTypes(options: TaskOptions) {
 		// Add module to pageSettings
 		pageSettings.compilerOptions.paths['backend/*.web'] = [ "../../../typescript/backend/*.web.ts" ] as never;
 		pageSettings.compilerOptions.paths['backend/*.web.js'] = [ "../../../typescript/backend/*.web.ts" ] as never;
+		pageSettings.compilerOptions.paths['backend/*'] = [ "../../../typescript/backend/*.web.ts" ] as never;
 		pageSettings.compilerOptions.paths['backend/*.jsw'] = [ "../../../typescript/backend/*.jsw.ts" ] as never;
 		pageSettings.compilerOptions.paths['types/*'] = [ "../../../typescript/types/*" ] as never;
 		pageSettings.compilerOptions.paths['backend/*.jsw'] = [ "../../../typescript/backend/*.jsw.ts" ] as never;
@@ -78,6 +81,7 @@ export function updateWixTypes(options: TaskOptions) {
 				// Add module to publicSettings
 				publicSettings.compilerOptions.paths['backend/*.web.js'].push(`../../../${name}/backend/*.web.ts` as never);
 				publicSettings.compilerOptions.paths['backend/*.web'].push(`../../../${name}/backend/*.web.ts` as never);
+				publicSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.web.ts` as never);
 				publicSettings.compilerOptions.paths['backend/*.jsw'].push(`../../../${name}/backend/*.jsw.ts` as never);
 				publicSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*` as never);
 				publicSettings.compilerOptions.paths.mocks.push(...[ `../../../${name}/__mocks__/*` as never ]);
@@ -105,6 +109,7 @@ export function updateWixTypes(options: TaskOptions) {
 				// Add module to masterSettings
 				masterSettings.compilerOptions.paths['backend/*.web.js'].push(`../../../${name}/backend/*.web.ts` as never);
 				masterSettings.compilerOptions.paths['backend/*.web'].push(`../../../${name}/backend/*.web.ts` as never);
+				masterSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.web.ts` as never);
 				masterSettings.compilerOptions.paths['backend/*.jsw'].push(`../../../${name}/backend/*.jsw.ts` as never);
 				masterSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*` as never);
 				masterSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*` as never);
@@ -118,6 +123,7 @@ export function updateWixTypes(options: TaskOptions) {
 				// Add module to pageSettings
 				pageSettings.compilerOptions.paths['backend/*.web.js'].push(`../../../${name}/backend/*.web.ts` as never);
 				pageSettings.compilerOptions.paths['backend/*.web'].push(`../../../${name}/backend/*.web.ts` as never);
+				pageSettings.compilerOptions.paths['backend/*'].push(`../../../${name}/backend/*.web.ts` as never);
 				pageSettings.compilerOptions.paths['backend/*.jsw'].push(`../../../${name}/backend/*.jsw.ts` as never);
 				pageSettings.compilerOptions.paths['public/*'].push(`../../../${name}/public/*` as never);
 				pageSettings.compilerOptions.paths['types/*'].push(`../../../${name}/types/*` as never);
@@ -182,44 +188,47 @@ export function updateWixTypes(options: TaskOptions) {
 }
 
 export function addTypes(options: TaskOptions, done: gulp.TaskFunctionCallback): NodeJS.ReadWriteStream {
-	const { replaceOptions } = options;
-	// const processPages = gulp.src(['./.wix/types/wix-code-types/dist/types/page/$w.d.ts'])
-	// 	.pipe(replace('declare namespace \\$w {', ' declare namespace $w{\nconst api: $w.Api;\n', replaceOptions))
-	// 	.pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/page/'));
+    const { replaceOptions } = options;
 
-	const exportTypes = gulp.src(['./.wix/types/wix-code-types/dist/types/common/*.d.ts', '!./.wix/types/wix-code-types/dist/types/common/$w.d.ts'])
-		.pipe(replace('interface ', 'export interface ', replaceOptions))
-		.pipe(replace('enum ', 'export enum ', replaceOptions))
-		.pipe(replace('type ', 'export type ', replaceOptions))
-		.pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/common/'));
+    // Regex to match keywords at the beginning of a line, capturing any leading whitespace.
+    // The 'm' flag is for multiline matching (^ matches start of line).
+    // The 'g' flag is for global matching (replace all instances).
+    const interfaceRegex = /^(\s*)interface\s/gm;
+    const enumRegex = /^(\s*)enum\s/gm;
+    const typeRegex = /^(\s*)type\s/gm;
 
-	const exportTypesBeta = gulp.src(['./.wix/types/wix-code-types/dist/types/beta/common/*.d.ts', '!./.wix/types/wix-code-types/dist/types/beta/common/$w.d.ts'])
-		.pipe(replace('interface ', 'export interface ', replaceOptions))
-		.pipe(replace('enum ', 'export enum ', replaceOptions))
-		.pipe(replace('type ', 'export type ', replaceOptions))
-		.pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/beta/common/'));
+    const exportTypes = gulp.src(['./.wix/types/wix-code-types/dist/types/common/*.d.ts', '!./.wix/types/wix-code-types/dist/types/common/$w.d.ts'])
+        // The replacement string '$1export...' uses the captured whitespace to preserve indentation.
+        .pipe(replace(interfaceRegex, 'export interface ', replaceOptions))
+        .pipe(replace(enumRegex, 'export enum ', replaceOptions))
+        .pipe(replace(typeRegex, 'export type ', replaceOptions))
+        .pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/common/'));
 
-	const processCommon = gulp.src(['./.wix/types/wix-code-types/dist/types/common/$w.d.ts'])
-		.pipe(insert.prepend("import '@total-typescript/ts-reset';\n"))
-		// .pipe(replace('namespace \\$w {', 'declare namespace $w{\ntype Api = FrontendAPI;\n', replaceOptions))
-		.pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/common/'));
+    const exportTypesBeta = gulp.src(['./.wix/types/wix-code-types/dist/types/beta/common/*.d.ts', '!./.wix/types/wix-code-types/dist/types/beta/common/$w.d.ts'])
+        .pipe(replace(interfaceRegex, '$1export interface ', replaceOptions))
+        .pipe(replace(enumRegex, 'export enum ', replaceOptions))
+        .pipe(replace(typeRegex, 'export type ', replaceOptions))
+        .pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/beta/common/'));
 
-	return merge(
-		// processPages,
-		processCommon,
-		exportTypesBeta,
-		exportTypes,
-	)
-	.on('error', function(e: Error) {
-		console.log("💩" + red.underline.bold(' => Updating WIX failed!'));
-		console.log("💩" + red.underline.bold(` => Error: ${orange(e.message)}`));
-		this.emit('end');
-		done();
-	})
-	.on('end', function() {
-		console.log("🐶" + blue.underline(' => Updating WIX succeeded!'));
-		done();
-	});
+    const processCommon = gulp.src(['./.wix/types/wix-code-types/dist/types/common/$w.d.ts'])
+        .pipe(insert.prepend("import '@total-typescript/ts-reset';\n"))
+        .pipe(gulp.dest('./.wix/types/wix-code-types/dist/types/common/'));
+
+    return merge(
+        processCommon,
+        exportTypesBeta,
+        exportTypes,
+    )
+    .on('error', function(e: Error) {
+        console.log("💩" + red.underline.bold(' => Updating WIX failed!'));
+        console.log("💩" + red.underline.bold(` => Error: ${orange(e.message)}`));
+        this.emit('end');
+        done();
+    })
+    .on('end', function() {
+        console.log("🐶" + blue.underline(' => Updating WIX succeeded!'));
+        done();
+    });
 };
 
 function makeHashable(obj: any): any {