wip

storybookjs · Dec 6, 2024 · e31f283 · e31f283
1 parent 0d18fca
commit e31f283
Show file tree

Hide file tree

Showing 72 changed files with 115 additions and 195 deletions.
diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
@@ -56,29 +56,66 @@
     "@storybook/components": "workspace:*",
     "@storybook/core-webpack": "workspace:*",
     "@storybook/global": "^5.0.0",
-    "@storybook/preset-angular-webpack": "workspace:*",
+    "@storybook/manager-api": "workspace:*",
+    "@storybook/preview-api": "workspace:*",
+    "@storybook/theming": "workspace:*",
     "@types/node": "^22.0.0",
+    "@types/react": "^18.0.37",
+    "@types/react-dom": "^18.0.11",
     "@types/semver": "^7.3.4",
     "@types/webpack-env": "^1.18.0",
     "fd-package-json": "^1.2.0",
     "find-up": "^5.0.0",
     "semver": "^7.3.7",
     "telejson": "^7.2.0",
     "ts-dedent": "^2.0.0",
+    "tsconfig-paths-webpack-plugin": "^4.0.1",
     "util-deprecate": "^1.0.2",
     "webpack": "5"
   },
   "devDependencies": {
     "@analogjs/vite-plugin-angular": "^0.2.24",
-    "typescript": "^5.3.2"
+    "@angular-devkit/architect": "^0.1703.0",
+    "@angular-devkit/build-angular": "^17.3.0",
+    "@angular-devkit/core": "^17.3.0",
+    "@angular/animations": "^17.3.0",
+    "@angular/cli": "^17.3.0",
+    "@angular/common": "^17.3.0",
+    "@angular/compiler": "^17.3.0",
+    "@angular/compiler-cli": "^17.3.0",
+    "@angular/core": "^17.3.0",
+    "@angular/forms": "^17.3.0",
+    "@angular/platform-browser": "^17.3.0",
+    "@angular/platform-browser-dynamic": "^17.3.0",
+    "@types/cross-spawn": "^6.0.2",
+    "@types/tmp": "^0.2.3",
+    "cross-spawn": "^7.0.3",
+    "tmp": "^0.2.1",
+    "typescript": "^5.3.2",
+    "webpack": "5",
+    "zone.js": "^0.14.2"
   },
   "peerDependencies": {
     "@angular-devkit/architect": ">=0.1500.0 < 0.2000.0",
     "@angular-devkit/build-angular": ">=15.0.0 < 20.0.0",
     "@angular-devkit/core": ">=15.0.0 < 20.0.0",
+    "@angular/cli": ">=15.0.0 < 20.0.0",
+    "@angular/common": ">=15.0.0 < 20.0.0",
+    "@angular/compiler": ">=15.0.0 < 20.0.0",
+    "@angular/compiler-cli": ">=15.0.0 < 20.0.0",
+    "@angular/core": ">=15.0.0 < 20.0.0",
+    "@angular/forms": ">=15.0.0 < 20.0.0",
+    "@angular/platform-browser": ">=15.0.0 < 20.0.0",
+    "@angular/platform-browser-dynamic": ">=15.0.0 < 20.0.0",
     "rxjs": "^6.0.0 || ^7.4.0",
     "storybook": "workspace:^",
-    "typescript": "^4.0.0 || ^5.0.0"
+    "typescript": "^4.0.0 || ^5.0.0",
+    "zone.js": ">= 0.11.1 < 1.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@angular/cli": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">=18.0.0"
@@ -92,7 +129,10 @@
       "./src/index.ts",
       "./src/preset.ts",
       "./src/builders/build-storybook/index.ts",
-      "./src/builders/start-storybook/index.ts"
+      "./src/builders/start-storybook/index.ts",
+      "./src/server/framework-preset-angular-cli.ts",
+      "./src/server/framework-preset-angular-ivy.ts",
+      "./src/server/framework-preset-angular-docs.ts"
     ],
     "post": "./scripts/postbuild.js",
     "platform": "node"

diff --git a/code/frameworks/angular/src/index.ts b/code/frameworks/angular/src/index.ts
@@ -1,4 +1,15 @@
 // For backwarts compatibility
 export * from '@storybook/angular-renderer';
-export * from '@storybook/preset-angular-webpack';
 export * from './types';
+
+/*
+ * ATTENTION:
+ * - moduleMetadata
+ * - NgModuleMetadata
+ * - ICollection
+ *
+ * These typings are coped out of decorators.d.ts and types.d.ts in order to fix a bug with tsc
+ * It was imported out of dist before which was not the proper way of exporting public API
+ *
+ * This can be fixed by migrating app/angular to typescript
+ */
diff --git a/code/frameworks/angular/src/preset.ts b/code/frameworks/angular/src/preset.ts
@@ -1,14 +1,23 @@
 import { PresetProperty } from 'storybook/internal/types';
+
 import { dirname, join } from 'node:path';
-import { StorybookConfig } from './types';
 
 const getAbsolutePath = <I extends string>(input: I): I =>
   dirname(require.resolve(join(input, 'package.json'))) as any;
 
 export const addons: PresetProperty<'addons'> = [
-  getAbsolutePath('@storybook/preset-angular-webpack'),
+  require.resolve('./server/framework-preset-angular-cli'),
+  require.resolve('./server/framework-preset-angular-ivy'),
+  require.resolve('./server/framework-preset-angular-docs'),
 ];
 
+export const typescript: PresetProperty<'typescript'> = async (config) => {
+  return {
+    ...config,
+    skipCompiler: true,
+  };
+};
+
 export const core: PresetProperty<'core'> = async (config, options) => {
   const framework = await options.presets.apply('framework');
 

diff --git a/...space__/empty-projects-entry/angular.json → ...space__/empty-projects-entry/angular.json b/...space__/empty-projects-entry/angular.json → ...space__/empty-projects-entry/angular.json
diff --git a/...g-workspace__/minimal-config/angular.json → ...g-workspace__/minimal-config/angular.json b/...g-workspace__/minimal-config/angular.json → ...g-workspace__/minimal-config/angular.json
diff --git a/...ng-workspace__/minimal-config/src/main.ts → ...ng-workspace__/minimal-config/src/main.ts b/...ng-workspace__/minimal-config/src/main.ts → ...ng-workspace__/minimal-config/src/main.ts
diff --git a/...ce__/minimal-config/src/tsconfig.app.json → ...ce__/minimal-config/src/tsconfig.app.json b/...ce__/minimal-config/src/tsconfig.app.json → ...ce__/minimal-config/src/tsconfig.app.json
diff --git a/...-workspace__/minimal-config/tsconfig.json → ...-workspace__/minimal-config/tsconfig.json b/...-workspace__/minimal-config/tsconfig.json → ...-workspace__/minimal-config/tsconfig.json
diff --git a/...s-ng-workspace__/some-config/angular.json → ...s-ng-workspace__/some-config/angular.json b/...s-ng-workspace__/some-config/angular.json → ...s-ng-workspace__/some-config/angular.json
diff --git a/...ks-ng-workspace__/some-config/src/main.ts → ...ks-ng-workspace__/some-config/src/main.ts b/...ks-ng-workspace__/some-config/src/main.ts → ...ks-ng-workspace__/some-config/src/main.ts
diff --git a/...space__/some-config/src/tsconfig.app.json → ...space__/some-config/src/tsconfig.app.json b/...space__/some-config/src/tsconfig.app.json → ...space__/some-config/src/tsconfig.app.json
diff --git a/...-ng-workspace__/some-config/tsconfig.json → ...-ng-workspace__/some-config/tsconfig.json b/...-ng-workspace__/some-config/tsconfig.json → ...-ng-workspace__/some-config/tsconfig.json
diff --git a/...__/with-angularBrowserTarget/angular.json → ...__/with-angularBrowserTarget/angular.json b/...__/with-angularBrowserTarget/angular.json → ...__/with-angularBrowserTarget/angular.json
diff --git a/...e__/with-angularBrowserTarget/src/main.ts → ...e__/with-angularBrowserTarget/src/main.ts b/...e__/with-angularBrowserTarget/src/main.ts → ...e__/with-angularBrowserTarget/src/main.ts
diff --git a/.../with-angularBrowserTarget/src/styles.css → .../with-angularBrowserTarget/src/styles.css b/.../with-angularBrowserTarget/src/styles.css → .../with-angularBrowserTarget/src/styles.css
diff --git a/...ngularBrowserTarget/src/tsconfig.app.json → ...ngularBrowserTarget/src/tsconfig.app.json b/...ngularBrowserTarget/src/tsconfig.app.json → ...ngularBrowserTarget/src/tsconfig.app.json
diff --git a/..._/with-angularBrowserTarget/tsconfig.json → ..._/with-angularBrowserTarget/tsconfig.json b/..._/with-angularBrowserTarget/tsconfig.json → ..._/with-angularBrowserTarget/tsconfig.json
diff --git a/...ocks-ng-workspace__/with-lib/angular.json → ...ocks-ng-workspace__/with-lib/angular.json b/...ocks-ng-workspace__/with-lib/angular.json → ...ocks-ng-workspace__/with-lib/angular.json
diff --git a/...with-lib/projects/pattern-lib/src/main.ts → ...with-lib/projects/pattern-lib/src/main.ts b/...with-lib/projects/pattern-lib/src/main.ts → ...with-lib/projects/pattern-lib/src/main.ts
diff --git a/...ib/projects/pattern-lib/tsconfig.lib.json → ...ib/projects/pattern-lib/tsconfig.lib.json b/...ib/projects/pattern-lib/tsconfig.lib.json → ...ib/projects/pattern-lib/tsconfig.lib.json
diff --git a/...cks-ng-workspace__/with-lib/tsconfig.json → ...cks-ng-workspace__/with-lib/tsconfig.json b/...cks-ng-workspace__/with-lib/tsconfig.json → ...cks-ng-workspace__/with-lib/tsconfig.json
diff --git a/...-ng-workspace__/with-nx-workspace/nx.json → ...-ng-workspace__/with-nx-workspace/nx.json b/...-ng-workspace__/with-nx-workspace/nx.json → ...-ng-workspace__/with-nx-workspace/nx.json
diff --git a/...workspace__/with-nx-workspace/src/main.ts → ...workspace__/with-nx-workspace/src/main.ts b/...workspace__/with-nx-workspace/src/main.ts → ...workspace__/with-nx-workspace/src/main.ts
diff --git a/...kspace__/with-nx-workspace/src/styles.css → ...kspace__/with-nx-workspace/src/styles.css b/...kspace__/with-nx-workspace/src/styles.css → ...kspace__/with-nx-workspace/src/styles.css
diff --git a/...space__/with-nx-workspace/src/styles.scss → ...space__/with-nx-workspace/src/styles.scss b/...space__/with-nx-workspace/src/styles.scss → ...space__/with-nx-workspace/src/styles.scss
diff --git a/..._/with-nx-workspace/src/tsconfig.app.json → ..._/with-nx-workspace/src/tsconfig.app.json b/..._/with-nx-workspace/src/tsconfig.app.json → ..._/with-nx-workspace/src/tsconfig.app.json
diff --git a/...rkspace__/with-nx-workspace/tsconfig.json → ...rkspace__/with-nx-workspace/tsconfig.json b/...rkspace__/with-nx-workspace/tsconfig.json → ...rkspace__/with-nx-workspace/tsconfig.json
diff --git a/...kspace__/with-nx-workspace/workspace.json → ...kspace__/with-nx-workspace/workspace.json b/...kspace__/with-nx-workspace/workspace.json → ...kspace__/with-nx-workspace/workspace.json
diff --git a/...mocks-ng-workspace__/with-nx/angular.json → ...mocks-ng-workspace__/with-nx/angular.json b/...mocks-ng-workspace__/with-nx/angular.json → ...mocks-ng-workspace__/with-nx/angular.json
diff --git a/...er/__mocks-ng-workspace__/with-nx/nx.json → ...er/__mocks-ng-workspace__/with-nx/nx.json b/...er/__mocks-ng-workspace__/with-nx/nx.json → ...er/__mocks-ng-workspace__/with-nx/nx.json
diff --git a/..._mocks-ng-workspace__/with-nx/src/main.ts → ..._mocks-ng-workspace__/with-nx/src/main.ts b/..._mocks-ng-workspace__/with-nx/src/main.ts → ..._mocks-ng-workspace__/with-nx/src/main.ts
diff --git a/...cks-ng-workspace__/with-nx/src/styles.css → ...cks-ng-workspace__/with-nx/src/styles.css b/...cks-ng-workspace__/with-nx/src/styles.css → ...cks-ng-workspace__/with-nx/src/styles.css
diff --git a/...ks-ng-workspace__/with-nx/src/styles.scss → ...ks-ng-workspace__/with-nx/src/styles.scss b/...ks-ng-workspace__/with-nx/src/styles.scss → ...ks-ng-workspace__/with-nx/src/styles.scss
diff --git a/...workspace__/with-nx/src/tsconfig.app.json → ...workspace__/with-nx/src/tsconfig.app.json b/...workspace__/with-nx/src/tsconfig.app.json → ...workspace__/with-nx/src/tsconfig.app.json
diff --git a/...ocks-ng-workspace__/with-nx/tsconfig.json → ...ocks-ng-workspace__/with-nx/tsconfig.json b/...ocks-ng-workspace__/with-nx/tsconfig.json → ...ocks-ng-workspace__/with-nx/tsconfig.json
diff --git a/...kspace__/with-options-styles/angular.json → ...kspace__/with-options-styles/angular.json b/...kspace__/with-options-styles/angular.json → ...kspace__/with-options-styles/angular.json
diff --git a/...rkspace__/with-options-styles/src/main.ts → ...rkspace__/with-options-styles/src/main.ts b/...rkspace__/with-options-styles/src/main.ts → ...rkspace__/with-options-styles/src/main.ts
diff --git a/...pace__/with-options-styles/src/styles.css → ...pace__/with-options-styles/src/styles.css b/...pace__/with-options-styles/src/styles.css → ...pace__/with-options-styles/src/styles.css
diff --git a/...ace__/with-options-styles/src/styles.scss → ...ace__/with-options-styles/src/styles.scss b/...ace__/with-options-styles/src/styles.scss → ...ace__/with-options-styles/src/styles.scss
diff --git a/...with-options-styles/src/tsconfig.app.json → ...with-options-styles/src/tsconfig.app.json b/...with-options-styles/src/tsconfig.app.json → ...with-options-styles/src/tsconfig.app.json
diff --git a/...space__/with-options-styles/tsconfig.json → ...space__/with-options-styles/tsconfig.json b/...space__/with-options-styles/tsconfig.json → ...space__/with-options-styles/tsconfig.json
diff --git a/...hout-architect-build-options/angular.json → ...hout-architect-build-options/angular.json b/...hout-architect-build-options/angular.json → ...hout-architect-build-options/angular.json
diff --git a/...ce__/without-architect-build/angular.json → ...ce__/without-architect-build/angular.json b/...ce__/without-architect-build/angular.json → ...ce__/without-architect-build/angular.json
diff --git a/.../without-compatible-projects/angular.json → .../without-compatible-projects/angular.json b/.../without-compatible-projects/angular.json → .../without-compatible-projects/angular.json
diff --git a/...ace__/without-projects-entry/angular.json → ...ace__/without-projects-entry/angular.json b/...ace__/without-projects-entry/angular.json → ...ace__/without-projects-entry/angular.json
diff --git a/...ts-entry/projects/pattern-lib/src/main.ts → ...ts-entry/projects/pattern-lib/src/main.ts b/...ts-entry/projects/pattern-lib/src/main.ts → ...ts-entry/projects/pattern-lib/src/main.ts
diff --git a/...ry/projects/pattern-lib/tsconfig.lib.json → ...ry/projects/pattern-lib/tsconfig.lib.json b/...ry/projects/pattern-lib/tsconfig.lib.json → ...ry/projects/pattern-lib/tsconfig.lib.json
diff --git a/...ce__/without-projects-entry/tsconfig.json → ...ce__/without-projects-entry/tsconfig.json b/...ce__/without-projects-entry/tsconfig.json → ...ce__/without-projects-entry/tsconfig.json
diff --git a/...workspace__/without-tsConfig/angular.json → ...workspace__/without-tsConfig/angular.json b/...workspace__/without-tsConfig/angular.json → ...workspace__/without-tsConfig/angular.json
diff --git a/...-workspace__/without-tsConfig/src/main.ts → ...-workspace__/without-tsConfig/src/main.ts b/...-workspace__/without-tsConfig/src/main.ts → ...-workspace__/without-tsConfig/src/main.ts
diff --git a/...__/without-tsConfig/src/tsconfig.app.json → ...__/without-tsConfig/src/tsconfig.app.json b/...__/without-tsConfig/src/tsconfig.app.json → ...__/without-tsConfig/src/tsconfig.app.json
diff --git a/...orkspace__/without-tsConfig/tsconfig.json → ...orkspace__/without-tsConfig/tsconfig.json b/...orkspace__/without-tsConfig/tsconfig.json → ...orkspace__/without-tsConfig/tsconfig.json
diff --git a/...webpack/src/server/__tests__/angular.json → ...angular/src/server/__tests__/angular.json b/...webpack/src/server/__tests__/angular.json → ...angular/src/server/__tests__/angular.json
diff --git a/...bpack/src/server/angular-cli-webpack.d.ts → ...gular/src/server/angular-cli-webpack.d.ts b/...bpack/src/server/angular-cli-webpack.d.ts → ...gular/src/server/angular-cli-webpack.d.ts
diff --git a/...webpack/src/server/angular-cli-webpack.js → ...angular/src/server/angular-cli-webpack.js b/...webpack/src/server/angular-cli-webpack.js → ...angular/src/server/angular-cli-webpack.js
diff --git a/...rc/server/framework-preset-angular-cli.ts → ...rc/server/framework-preset-angular-cli.ts b/...rc/server/framework-preset-angular-cli.ts → ...rc/server/framework-preset-angular-cli.ts
@@ -1,18 +1,16 @@
 import { logger } from 'storybook/internal/node-logger';
 import { AngularLegacyBuildOptionsError } from 'storybook/internal/server-errors';
 
-import type { BuilderContext } from '@angular-devkit/architect';
-import { targetFromTargetString } from '@angular-devkit/architect';
-import type { JsonObject } from '@angular-devkit/core';
-import { logging } from '@angular-devkit/core';
+import { BuilderContext, targetFromTargetString } from '@angular-devkit/architect';
+import { JsonObject, logging } from '@angular-devkit/core';
 import { sync as findUpSync } from 'find-up';
-import type { Configuration } from 'webpack';
+import webpack from 'webpack';
 
 import { getWebpackConfig as getCustomWebpackConfig } from './angular-cli-webpack';
-import type { PresetOptions } from './preset-options';
+import { PresetOptions } from './preset-options';
 import { moduleIsAvailable } from './utils/module-is-available';
 
-export const webpackFinal = async (baseConfig: Configuration, options: PresetOptions) => {
+export async function webpackFinal(baseConfig: webpack.Configuration, options: PresetOptions) {
   if (!moduleIsAvailable('@angular-devkit/build-angular')) {
     logger.info('=> Using base config because "@angular-devkit/build-angular" is not installed');
     return baseConfig;
@@ -30,7 +28,7 @@ export const webpackFinal = async (baseConfig: Configuration, options: PresetOpt
     },
     builderContext,
   });
-};
+}
 
 /** Get Builder Context If storybook is not start by angular builder create dumb BuilderContext */
 function getBuilderContext(options: PresetOptions): BuilderContext {

diff --git a/...c/server/framework-preset-angular-docs.ts → ...c/server/framework-preset-angular-docs.ts b/...c/server/framework-preset-angular-docs.ts → ...c/server/framework-preset-angular-docs.ts
@@ -1,9 +1,7 @@
 import { hasDocsOrControls } from 'storybook/internal/docs-tools';
-import type { PresetProperty } from 'storybook/internal/types';
+import { PresetProperty } from 'storybook/internal/types';
 
 export const previewAnnotations: PresetProperty<'previewAnnotations'> = (entry = [], options) => {
-  if (!hasDocsOrControls(options)) {
-    return entry;
-  }
+  if (!hasDocsOrControls(options)) return entry;
   return [...entry, require.resolve('@storybook/angular-renderer/client/docs/config')];
 };
diff --git a/...rc/server/framework-preset-angular-ivy.ts → ...rc/server/framework-preset-angular-ivy.ts b/...rc/server/framework-preset-angular-ivy.ts → ...rc/server/framework-preset-angular-ivy.ts
@@ -1,12 +1,12 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import type { Preset } from 'storybook/internal/types';
+import { Preset } from 'storybook/internal/types';
 
-import type { Configuration } from 'webpack';
+import { Configuration } from 'webpack';
 
-import type { AngularOptions } from '../types';
-import type { PresetOptions } from './preset-options';
+import { AngularOptions } from '../types';
+import { PresetOptions } from './preset-options';
 
 /**
  * Source :

diff --git a/...orybook-normalize-angular-entry-plugin.js → ...orybook-normalize-angular-entry-plugin.js b/...orybook-normalize-angular-entry-plugin.js → ...orybook-normalize-angular-entry-plugin.js
diff --git a/...ular-webpack/src/server/preset-options.ts → ...orks/angular/src/server/preset-options.ts b/...ular-webpack/src/server/preset-options.ts → ...orks/angular/src/server/preset-options.ts
@@ -1,8 +1,8 @@
-import type { Options as CoreOptions } from 'storybook/internal/types';
+import { Options as CoreOptions } from 'storybook/internal/types';
 
-import type { BuilderContext } from '@angular-devkit/architect';
-import type { StylePreprocessorOptions } from '@angular-devkit/build-angular';
-import type { StyleElement } from '@angular-devkit/build-angular/src/builders/browser/schema';
+import { BuilderContext } from '@angular-devkit/architect';
+import { StylePreprocessorOptions } from '@angular-devkit/build-angular';
+import { StyleElement } from '@angular-devkit/build-angular/src/builders/browser/schema';
 
 export type PresetOptions = CoreOptions & {
   /* Allow to get the options of a targeted "browser builder"  */

diff --git a/.../server/utils/filter-out-styling-rules.ts → .../server/utils/filter-out-styling-rules.ts b/.../server/utils/filter-out-styling-rules.ts → .../server/utils/filter-out-styling-rules.ts
diff --git a/...k/src/server/utils/module-is-available.ts → ...r/src/server/utils/module-is-available.ts b/...k/src/server/utils/module-is-available.ts → ...r/src/server/utils/module-is-available.ts
diff --git a/code/frameworks/angular/src/types.ts b/code/frameworks/angular/src/types.ts
@@ -9,7 +9,6 @@ import {
   StorybookConfig as StorybookConfigBase,
   TypescriptOptions as TypescriptOptionsReact,
 } from '@storybook/core-webpack';
-import { AngularOptions } from '@storybook/preset-angular-webpack';
 
 type FrameworkName = CompatibleString<'@storybook/angular'>;
 type BuilderName = CompatibleString<'@storybook/builder-webpack5'>;
@@ -44,3 +43,8 @@ export type StorybookConfig = Omit<
 > &
   StorybookConfigWebpack &
   StorybookConfigFramework;
+
+export interface AngularOptions {
+  enableIvy?: boolean;
+  enableNgcc?: boolean;
+}
diff --git a/code/package.json b/code/package.json
@@ -139,7 +139,6 @@
     "@storybook/preact": "workspace:*",
     "@storybook/preact-vite": "workspace:*",
     "@storybook/preact-webpack5": "workspace:*",
-    "@storybook/preset-angular-webpack": "workspace:*",
     "@storybook/preset-create-react-app": "workspace:*",
     "@storybook/preset-html-webpack": "workspace:*",
     "@storybook/preset-preact-webpack": "workspace:*",
@@ -201,6 +200,7 @@
     "happy-dom": "^14.12.0",
     "http-server": "^14.1.1",
     "husky": "^4.3.7",
+    "jiti": "^2.4.1",
     "lint-staged": "^13.2.2",
     "mock-require": "^3.0.3",
     "nx": "18.0.6",

diff --git a/code/presets/angular-webpack/README.md b/code/presets/angular-webpack/README.md
diff --git a/code/presets/angular-webpack/package.json b/code/presets/angular-webpack/package.json
diff --git a/code/presets/angular-webpack/preset.js b/code/presets/angular-webpack/preset.js
diff --git a/code/presets/angular-webpack/project.json b/code/presets/angular-webpack/project.json
diff --git a/code/presets/angular-webpack/src/index.ts b/code/presets/angular-webpack/src/index.ts
diff --git a/code/presets/angular-webpack/src/types.ts b/code/presets/angular-webpack/src/types.ts