chore: deno housekeeping (#31)

* chore: add npm prefix to fs-extra types

* test: uncomment tests using objectContaining

.github/workflows/build.yml

@@ -14,6 +14,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
       - name: Setup Deno
         uses: denoland/setup-deno@v2
         with:

deno.json

@@ -15,7 +15,7 @@
     "@deno/dnt": "jsr:@deno/dnt@^0.41.3",
     "@std/assert": "jsr:@std/assert@^1.0.6",
     "@std/expect": "jsr:@std/expect@^1.0.5",
-    "@std/testing": "jsr:@std/[email protected]",
+    "@std/testing": "jsr:@std/testing@^1.0.4",
     "@std/text": "jsr:@std/text@^1.0.7",
     "@types/fs-extra": "npm:@types/fs-extra@^11.0.4",
     "@types/node": "npm:@types/node@^22.7.5",

packages/core/src/codegen/generator.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import { OpenApiParser } from '../parse/parser.ts';

packages/core/src/parse/parser.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { cwd } from 'node:process';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 import * as YAML from 'yaml';
 

packages/core/src/utils/asset-manager.ts

@@ -1,7 +1,7 @@
 import { basename, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 export class AssetManager {

packages/core/src/utils/file-system.utils.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import type { Nullable } from './type.utils.ts';

packages/core/src/utils/schema.utils.test.ts

@@ -1,7 +1,12 @@
 import { expect } from '@std/expect';
 import { describe, it } from '@std/testing/bdd';
 
-import { createCombinedSchema, createStringSchema } from '../../tests/schema-factory.ts';
+import {
+  createCombinedSchema,
+  createObjectSchema,
+  createStringSchema,
+  createUnknownProperty,
+} from '../../tests/schema-factory.ts';
 import { resolveAnyOfAndAllOf } from './schema.utils.ts';
 
 describe('resolveAnyOfAndAllOf', () => {
@@ -14,73 +19,69 @@ describe('resolveAnyOfAndAllOf', () => {
     expect(result).toBeUndefined();
   });
 
-  // TODO: Uncomment as soon as @std/expect has new version (https://github.com/denoland/std/pull/6065)
-  // it('should resolve schema from allOf and anyOf', () => {
-  //   const schema = createObjectSchema({
-  //     name: 'root',
-  //     properties: [createUnknownProperty('prop0')],
-  //     required: ['prop0'],
-  //     allOf: [createObjectSchema({ properties: [createUnknownProperty('prop1')], required: ['prop1'] })],
-  //     anyOf: [createObjectSchema({ properties: [createUnknownProperty('prop2')], required: ['prop2'] })],
-  //   });
+  it('should resolve schema from allOf and anyOf', () => {
+    const prop0 = createUnknownProperty('prop0');
+    const prop1 = createUnknownProperty('prop1');
+    const prop2 = createUnknownProperty('prop2');
+    const schema = createObjectSchema({
+      name: 'root',
+      properties: [prop0],
+      required: ['prop0'],
+      allOf: [createObjectSchema({ properties: [prop1], required: ['prop1'] })],
+      anyOf: [createObjectSchema({ properties: [prop2], required: ['prop2'] })],
+    });
 
-  //   const expectedResult = expect.objectContaining(
-  //     createObjectSchema({
-  //       name: 'root',
-  //       properties: [
-  //         expect.objectContaining(createUnknownProperty('prop0')),
-  //         expect.objectContaining(createUnknownProperty('prop1')),
-  //         expect.objectContaining(createUnknownProperty('prop2')),
-  //       ],
-  //       required: ['prop0', 'prop1', 'prop2'],
-  //     }),
-  //   );
+    const expectedResult = expect.objectContaining(
+      createObjectSchema({
+        name: 'root',
+        properties: [prop0, prop1, prop2],
+        required: ['prop0', 'prop1'],
+      }),
+    );
 
-  //   const result = resolveAnyOfAndAllOf(schema, true);
-  //   expect(result).toEqual(expectedResult);
-  // });
+    const result = resolveAnyOfAndAllOf(schema, true);
+    expect(result).toEqual(expectedResult);
+  });
 
-  // TODO: Uncomment as soon as @std/expect has new version (https://github.com/denoland/std/pull/6065)
-  // it('should merge properties from allOf and anyOf recursively', () => {
-  //   const schema = createCombinedSchema({
-  //     name: 'root',
-  //     allOf: [
-  //       createObjectSchema({
-  //         properties: [createUnknownProperty('prop1')],
-  //         required: ['prop1'],
-  //       }),
-  //     ],
-  //     anyOf: [
-  //       createCombinedSchema({
-  //         allOf: [
-  //           createObjectSchema({
-  //             properties: [createUnknownProperty('prop2')],
-  //             required: ['prop2'],
-  //           }),
-  //         ],
-  //         anyOf: [
-  //           createObjectSchema({
-  //             properties: [createUnknownProperty('prop3')],
-  //             required: ['prop3'],
-  //           }),
-  //         ],
-  //       }),
-  //     ],
-  //   });
+  it('should merge properties from allOf and anyOf recursively', () => {
+    const prop1 = createUnknownProperty('prop1');
+    const prop2 = createUnknownProperty('prop2');
+    const prop3 = createUnknownProperty('prop3');
+    const schema = createCombinedSchema({
+      name: 'root',
+      allOf: [
+        createObjectSchema({
+          properties: [prop1],
+          required: ['prop1'],
+        }),
+      ],
+      anyOf: [
+        createCombinedSchema({
+          allOf: [
+            createObjectSchema({
+              properties: [prop2],
+              required: ['prop2'],
+            }),
+          ],
+          anyOf: [
+            createObjectSchema({
+              properties: [prop3],
+              required: ['prop3'],
+            }),
+          ],
+        }),
+      ],
+    });
 
-  //   const expectedResult = expect.objectContaining(
-  //     createObjectSchema({
-  //       name: 'root',
-  //       properties: [
-  //         expect.objectContaining(createUnknownProperty('prop1')),
-  //         expect.objectContaining(createUnknownProperty('prop2')),
-  //         expect.objectContaining(createUnknownProperty('prop3')),
-  //       ],
-  //       required: ['prop1'],
-  //     }),
-  //   );
+    const expectedResult = expect.objectContaining(
+      createObjectSchema({
+        name: 'root',
+        properties: [prop1, prop2, prop3],
+        required: ['prop1'],
+      }),
+    );
 
-  //   const result = resolveAnyOfAndAllOf(schema, true);
-  //   expect(result).toEqual(expectedResult);
-  // });
+    const result = resolveAnyOfAndAllOf(schema, true);
+    expect(result).toEqual(expectedResult);
+  });
 });

packages/core/src/utils/source-builder.test.ts

@@ -36,8 +36,7 @@ describe('SourceBuilder', () => {
       };
       const sb = SourceBuilder.fromString(str, options);
       expect(sb.toString()).toEqual(str);
-      // TODO: Uncomment as soon as @std/expect has new version (https://github.com/denoland/std/pull/6065)
-      // expect(sb.options).toEqual(expect.objectContaining(options));
+      expect(sb.options).toEqual(expect.objectContaining(options));
     });
   });
 

packages/core/src/utils/string-builder/string-builder.test.ts

@@ -13,16 +13,15 @@ describe('fromString', () => {
     expect(sb.toString()).toEqual(str);
   });
 
-  // TODO: Uncomment as soon as @std/expect has new version (https://github.com/denoland/std/pull/6065)
-  // it('should create a StringBuilder instance with the given string and options', () => {
-  //   const str = 'test string';
-  //   const options: Partial<StringBuilderOptions> = {
-  //     newLine: '\r\n',
-  //   };
-  //   const sb = StringBuilder.fromString(str, options);
-  //   expect(sb.toString()).toEqual(str);
-  //   expect(sb.options).toEqual(expect.objectContaining(options));
-  // });
+  it('should create a StringBuilder instance with the given string and options', () => {
+    const str = 'test string';
+    const options: Partial<StringBuilderOptions> = {
+      newLine: '\r\n',
+    };
+    const sb = StringBuilder.fromString(str, options);
+    expect(sb.toString()).toEqual(str);
+    expect(sb.options).toEqual(expect.objectContaining(options));
+  });
 });
 
 describe('build', () => {

packages/kotlin/src/generators/models/model-generator.ts

@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/kotlin/src/generators/services/okhttp3-clients/okhttp3-client-generator.ts

@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {
@@ -68,7 +68,7 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<Context,
         [
           kt.parameter('basePath', kt.refs.string(), { default: 'defaultBasePath' }),
           kt.parameter('client', kt.refs.okhttp3.okHttpClient(), {
-            default: 'defaultClient'
+            default: 'defaultClient',
           }),
         ],
         null,

packages/kotlin/src/generators/services/okhttp3-clients/okhttp3-clients-generator.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/kotlin/src/generators/services/spring-controllers/spring-controller-generator.ts

@@ -1,4 +1,4 @@
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/kotlin/tests/openapi-models.test.ts

@@ -2,7 +2,7 @@ import { join } from 'node:path';
 
 import { afterEach, describe, test } from '@std/testing/bdd';
 import { restore, stub } from '@std/testing/mock';
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import { OpenApiGenerator, toCustomCase } from '@goast/core';

packages/typescript/src/file-builder.ts

@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import { type AppendParam, type AppendValue, isAppendValue, type Nullable, SourceBuilder } from '@goast/core';

packages/typescript/src/generators/services/angular-services/angular-services-generator.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/typescript/src/generators/services/easy-network-stub/easy-network-stubs-generator.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/typescript/src/generators/services/fetch-clients/fetch-clients-generator.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/typescript/src/generators/services/k6-clients/k6-clients-generator.ts

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import {

packages/typescript/tests/openapi-models.test.ts

@@ -1,6 +1,6 @@
 import { join } from 'node:path';
 
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 import { OpenApiGenerator, toCustomCase } from '@goast/core';

scripts/build_npm.ts

@@ -1,6 +1,6 @@
 import { build, type BuildOptions, emptyDir } from '@deno/dnt';
 import { resolve } from 'node:path';
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 type GoastNpmOptions = {

test/utils/paths.ts

@@ -1,6 +1,6 @@
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-// @deno-types="@types/fs-extra"
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
 
 declare const __dirname: string | undefined;

test/utils/verify.ts

@@ -1,12 +1,12 @@
-// @deno-types="@types/fs-extra"
+import { toKebabCase } from '@std/text';
+// @deno-types="npm:@types/fs-extra"
 import fs from 'fs-extra';
+import { spawn } from 'node:child_process';
 import { basename, dirname, join, relative, resolve } from 'node:path';
+import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 import * as util from 'node:util';
-import { spawn } from 'node:child_process';
 import { repoRootDir } from './paths.ts';
-import process from 'node:process';
-import { toKebabCase } from '@std/text';
 
 type VerifyError = 'no-expect-file' | 'verify-failed';