@opra/cli 0.13.0 → 0.14.0

package/bin/oprimp.mjs

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
 import '../esm/oprimp.js';
+

package/cjs/oprimp/generate-service.js

@@ -2,18 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateService = void 0;
 const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const console_1 = tslib_1.__importDefault(require("console"));
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const process = tslib_1.__importStar(require("process"));
+const node_client_1 = require("@opra/node-client");
+const ts_file_js_1 = require("../utils/ts-file.js");
+const delete_files_js_1 = require("./delete-files.js");
 const file_writer_js_1 = require("./file-writer.js");
-const generate_resoruces_js_1 = require("./generate-resoruces.js");
-const generate_types_js_1 = require("./generate-types.js");
+const process_resoruces_js_1 = require("./process-resoruces.js");
+const process_types_js_1 = require("./process-types.js");
 async function generateService(config) {
     const cwd = config.cwd || process.cwd();
-    const logger = config.logger || console;
+    const logger = config.logger || console_1.default;
+    console_1.default.log(chalk_1.default.yellow('Fetching service metadata from'), chalk_1.default.whiteBright(config.serviceUrl));
+    const client = await node_client_1.OpraHttpClient.create(config.serviceUrl);
+    const metadata = client.metadata;
+    console_1.default.log(chalk_1.default.yellow('Retrieved service info:'), chalk_1.default.whiteBright(metadata.info.title), '-', chalk_1.default.whiteBright(metadata.info.version));
+    console_1.default.log(chalk_1.default.yellow('Removing old files..'));
+    (0, delete_files_js_1.deleteFiles)(config.outDir);
+    let name = (metadata.info.title || 'Service1').replace(/[^\w_$]*/g, '');
+    name = name.charAt(0).toUpperCase() + name.substring(1);
     const ctx = {
         serviceUrl: config.serviceUrl,
-        document: config.document,
+        document: client.metadata,
+        name,
         logger,
         cwd,
         relativeDir: config.outDir,
@@ -23,7 +37,12 @@ async function generateService(config) {
         writer: config.writer || new file_writer_js_1.FileWriter()
     };
     fs.mkdirSync(ctx.absoluteDir, { recursive: true });
-    await (0, generate_types_js_1.generateTypes)(ctx);
-    await (0, generate_resoruces_js_1.generateResources)(ctx);
+    await (0, process_types_js_1.processTypes)(ctx);
+    await (0, process_resoruces_js_1.processResources)(ctx);
+    const indexTs = new ts_file_js_1.TsFile();
+    indexTs.header = ctx.fileHeader;
+    indexTs.addExport('./' + ctx.name + ctx.extension);
+    indexTs.addExport('./types' + ctx.extension);
+    await indexTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'index.ts'));
 }
 exports.generateService = generateService;

package/cjs/oprimp/process-resoruces.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processResources = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const common_1 = require("@opra/common");
+const string_utils_js_1 = require("../utils/string-utils.js");
+const ts_file_js_1 = require("../utils/ts-file.js");
+async function processResources(ctx) {
+    const targetDir = ctx.absoluteDir;
+    ctx.logger.log(chalk_1.default.yellow('Processing resources'));
+    const serviceTs = new ts_file_js_1.TsFile();
+    serviceTs.header = ctx.fileHeader;
+    serviceTs.addImport('@opra/client', 'OpraHttpClient');
+    serviceTs.content = `
+const kClient = Symbol('client');
+  
+export class ${ctx.name} {
+  static kClient = kClient;
+  [kClient]: OpraHttpClient;
+  
+  constructor(client: OpraHttpClient) {
+    this[kClient] = client;
+  }
+  `;
+    const resourceNames = Array.from(ctx.document.resources.keys()).sort();
+    for (const resourceName of resourceNames) {
+        const resource = ctx.document.getResource(resourceName);
+        serviceTs.content += `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(resource.description || resource.name)}
+ * @url ${(0, common_1.joinPath)(ctx.serviceUrl, '$metadata/resources/' + resource.name)}
+ */`;
+        if (resource instanceof common_1.CollectionResourceInfo) {
+            serviceTs.addImport('@opra/client', 'HttpCollectionService');
+            serviceTs.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+            const methods = resource.getHandlerNames()
+                .filter(x => x !== 'count')
+                .map(x => `'${x}'`).join(' | ');
+            serviceTs.content += `
+  get ${resource.name}(): Pick<HttpCollectionService<${resource.dataType.name}, never>, ${methods}> {
+    return this[kClient].collection('${resource.name}');
+  }\n`;
+        }
+        else if (resource instanceof common_1.SingletonResourceInfo) {
+            serviceTs.addImport('@opra/client', 'HttpSingletonService');
+            serviceTs.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+            const methods = resource.getHandlerNames()
+                .map(x => `'${x}'`).join(' | ');
+            serviceTs.content += `
+  get ${resource.name}(): Pick<HttpSingletonService<${resource.dataType.name}, never>, ${methods}> {
+    return this[kClient].singleton('${resource.name}');
+  }\n`;
+        }
+    }
+    serviceTs.content += `
+}\n`;
+    await serviceTs.writeFile(ctx, path_1.default.join(targetDir, ctx.name + '.ts'));
+}
+exports.processResources = processResources;

package/cjs/oprimp/{generate-types.js → process-types.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateTypes = void 0;
+exports.processTypes = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -15,9 +15,9 @@ const builtinsMap = {
     integer: 'number',
     date: 'Date'
 };
-async function generateTypes(ctx) {
+async function processTypes(ctx) {
     const targetDir = path_1.default.join(ctx.absoluteDir, 'types');
-    ctx.logger.log(chalk_1.default.yellow('Generating types'));
+    ctx.logger.log(chalk_1.default.yellow('Processing types'));
     const typesTs = new ts_file_js_1.TsFile();
     typesTs.header = ctx.fileHeader;
     let i = 0;
@@ -54,7 +54,7 @@ async function generateTypes(ctx) {
         await typesTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'types.ts'));
     }
 }
-exports.generateTypes = generateTypes;
+exports.processTypes = processTypes;
 async function generateComplexType(ctx, dataType, tsFile) {
     tsFile.header = ctx.fileHeader;
     tsFile.content = `

package/cjs/oprimp.js

@@ -7,8 +7,6 @@ const console = tslib_1.__importStar(require("console"));
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const process = tslib_1.__importStar(require("process"));
-const node_client_1 = require("@opra/node-client");
-const delete_files_js_1 = require("./oprimp/delete-files.js");
 const generate_service_js_1 = require("./oprimp/generate-service.js");
 const get_caller_file_util_js_1 = require("./utils/get-caller-file.util.js");
 const pkgJson = JSON.parse(fs.readFileSync(path_1.default.resolve(path_1.default.dirname((0, get_caller_file_util_js_1.getCallerFile)()), '../package.json'), 'utf-8'));
@@ -16,22 +14,17 @@ commander_1.program
     .version(pkgJson.version)
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
+    .option('--name <name>', 'Name of the service')
+    .option('--ext', 'Adds js extension to imports')
     .option('--no-color', 'Disables colors in logs messages')
-    .option('-e, --extension <extension>', 'File extensions of imports')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
         chalk_1.default.level = 0;
-    console.log(chalk_1.default.yellow('Fetching service metadata from'), chalk_1.default.whiteBright(serviceUrl));
-    const client = await node_client_1.OpraHttpClient.create(serviceUrl);
-    const metadata = client.metadata;
-    console.log(chalk_1.default.yellow('Retrieved service info:'), chalk_1.default.whiteBright(metadata.info.title), '-', chalk_1.default.whiteBright(metadata.info.version));
-    console.log(chalk_1.default.yellow('Removing old files..'));
-    (0, delete_files_js_1.deleteFiles)(outDir);
     await (0, generate_service_js_1.generateService)({
         serviceUrl,
-        document: metadata,
         outDir,
-        extension: (options.extension ? '.' + options.extension : ''),
+        name: options.name,
+        extension: (options.ext ? '.js' : ''),
         fileHeader: '/*\n' +
             ' * Generated by OPRA Service Generator \n' +
             ' * Version: ' + pkgJson.version + '\n' +

package/esm/interfaces/service-generation-context.interface.d.ts

@@ -4,6 +4,7 @@ import { ILogger } from './logger.interface.js';
 export interface ServiceGenerationContext {
     serviceUrl: string;
     document: OpraDocument;
+    name: string;
     cwd: string;
     logger: ILogger;
     relativeDir: string;

package/esm/oprimp/generate-service.d.ts

@@ -1,10 +1,9 @@
-import { OpraDocument } from '@opra/common';
 import { IFileWriter } from '../interfaces/file-writer.interface.js';
 import { ILogger } from '../interfaces/logger.interface.js';
 export interface ServiceGenerateConfig {
     serviceUrl: string;
-    document: OpraDocument;
     outDir: string;
+    name?: string;
     cwd?: string;
     logger?: ILogger;
     writer?: IFileWriter;

package/esm/oprimp/generate-service.js

@@ -1,15 +1,29 @@
+import chalk from 'chalk';
+import console from 'console';
 import * as fs from 'fs';
 import path from 'path';
 import * as process from 'process';
+import { OpraHttpClient } from '@opra/node-client';
+import { TsFile } from '../utils/ts-file.js';
+import { deleteFiles } from './delete-files.js';
 import { FileWriter } from './file-writer.js';
-import { generateResources } from './generate-resoruces.js';
-import { generateTypes } from './generate-types.js';
+import { processResources } from './process-resoruces.js';
+import { processTypes } from './process-types.js';
 export async function generateService(config) {
     const cwd = config.cwd || process.cwd();
     const logger = config.logger || console;
+    console.log(chalk.yellow('Fetching service metadata from'), chalk.whiteBright(config.serviceUrl));
+    const client = await OpraHttpClient.create(config.serviceUrl);
+    const metadata = client.metadata;
+    console.log(chalk.yellow('Retrieved service info:'), chalk.whiteBright(metadata.info.title), '-', chalk.whiteBright(metadata.info.version));
+    console.log(chalk.yellow('Removing old files..'));
+    deleteFiles(config.outDir);
+    let name = (metadata.info.title || 'Service1').replace(/[^\w_$]*/g, '');
+    name = name.charAt(0).toUpperCase() + name.substring(1);
     const ctx = {
         serviceUrl: config.serviceUrl,
-        document: config.document,
+        document: client.metadata,
+        name,
         logger,
         cwd,
         relativeDir: config.outDir,
@@ -19,6 +33,11 @@ export async function generateService(config) {
         writer: config.writer || new FileWriter()
     };
     fs.mkdirSync(ctx.absoluteDir, { recursive: true });
-    await generateTypes(ctx);
-    await generateResources(ctx);
+    await processTypes(ctx);
+    await processResources(ctx);
+    const indexTs = new TsFile();
+    indexTs.header = ctx.fileHeader;
+    indexTs.addExport('./' + ctx.name + ctx.extension);
+    indexTs.addExport('./types' + ctx.extension);
+    await indexTs.writeFile(ctx, path.join(ctx.absoluteDir, 'index.ts'));
 }

package/esm/oprimp/{generate-resoruces.d.ts → process-resoruces.d.ts}

@@ -1,2 +1,2 @@
 import { ServiceGenerationContext } from '../interfaces/service-generation-context.interface.js';
-export declare function generateResources(ctx: ServiceGenerationContext): Promise<void>;
+export declare function processResources(ctx: ServiceGenerationContext): Promise<void>;

package/esm/oprimp/process-resoruces.js

@@ -0,0 +1,54 @@
+import chalk from 'chalk';
+import path from 'path';
+import { CollectionResourceInfo, joinPath, SingletonResourceInfo } from '@opra/common';
+import { wrapJSDocString } from '../utils/string-utils.js';
+import { TsFile } from '../utils/ts-file.js';
+export async function processResources(ctx) {
+    const targetDir = ctx.absoluteDir;
+    ctx.logger.log(chalk.yellow('Processing resources'));
+    const serviceTs = new TsFile();
+    serviceTs.header = ctx.fileHeader;
+    serviceTs.addImport('@opra/client', 'OpraHttpClient');
+    serviceTs.content = `
+const kClient = Symbol('client');
+  
+export class ${ctx.name} {
+  static kClient = kClient;
+  [kClient]: OpraHttpClient;
+  
+  constructor(client: OpraHttpClient) {
+    this[kClient] = client;
+  }
+  `;
+    const resourceNames = Array.from(ctx.document.resources.keys()).sort();
+    for (const resourceName of resourceNames) {
+        const resource = ctx.document.getResource(resourceName);
+        serviceTs.content += `\n/**\n * ${wrapJSDocString(resource.description || resource.name)}
+ * @url ${joinPath(ctx.serviceUrl, '$metadata/resources/' + resource.name)}
+ */`;
+        if (resource instanceof CollectionResourceInfo) {
+            serviceTs.addImport('@opra/client', 'HttpCollectionService');
+            serviceTs.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+            const methods = resource.getHandlerNames()
+                .filter(x => x !== 'count')
+                .map(x => `'${x}'`).join(' | ');
+            serviceTs.content += `
+  get ${resource.name}(): Pick<HttpCollectionService<${resource.dataType.name}, never>, ${methods}> {
+    return this[kClient].collection('${resource.name}');
+  }\n`;
+        }
+        else if (resource instanceof SingletonResourceInfo) {
+            serviceTs.addImport('@opra/client', 'HttpSingletonService');
+            serviceTs.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+            const methods = resource.getHandlerNames()
+                .map(x => `'${x}'`).join(' | ');
+            serviceTs.content += `
+  get ${resource.name}(): Pick<HttpSingletonService<${resource.dataType.name}, never>, ${methods}> {
+    return this[kClient].singleton('${resource.name}');
+  }\n`;
+        }
+    }
+    serviceTs.content += `
+}\n`;
+    await serviceTs.writeFile(ctx, path.join(targetDir, ctx.name + '.ts'));
+}

package/esm/oprimp/{generate-types.d.ts → process-types.d.ts}

@@ -1,2 +1,2 @@
 import { ServiceGenerationContext } from '../interfaces/service-generation-context.interface.js';
-export declare function generateTypes(ctx: ServiceGenerationContext): Promise<void>;
+export declare function processTypes(ctx: ServiceGenerationContext): Promise<void>;

package/esm/oprimp/{generate-types.js → process-types.js}

@@ -11,9 +11,9 @@ const builtinsMap = {
     integer: 'number',
     date: 'Date'
 };
-export async function generateTypes(ctx) {
+export async function processTypes(ctx) {
     const targetDir = path.join(ctx.absoluteDir, 'types');
-    ctx.logger.log(chalk.yellow('Generating types'));
+    ctx.logger.log(chalk.yellow('Processing types'));
     const typesTs = new TsFile();
     typesTs.header = ctx.fileHeader;
     let i = 0;

package/esm/oprimp.js

@@ -4,8 +4,6 @@ import * as console from 'console';
 import * as fs from 'fs';
 import path from 'path';
 import * as process from 'process';
-import { OpraHttpClient } from '@opra/node-client';
-import { deleteFiles } from './oprimp/delete-files.js';
 import { generateService } from './oprimp/generate-service.js';
 import { getCallerFile } from './utils/get-caller-file.util.js';
 const pkgJson = JSON.parse(fs.readFileSync(path.resolve(path.dirname(getCallerFile()), '../package.json'), 'utf-8'));
@@ -13,22 +11,17 @@ program
     .version(pkgJson.version)
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
+    .option('--name <name>', 'Name of the service')
+    .option('--ext', 'Adds js extension to imports')
     .option('--no-color', 'Disables colors in logs messages')
-    .option('-e, --extension <extension>', 'File extensions of imports')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
         chalk.level = 0;
-    console.log(chalk.yellow('Fetching service metadata from'), chalk.whiteBright(serviceUrl));
-    const client = await OpraHttpClient.create(serviceUrl);
-    const metadata = client.metadata;
-    console.log(chalk.yellow('Retrieved service info:'), chalk.whiteBright(metadata.info.title), '-', chalk.whiteBright(metadata.info.version));
-    console.log(chalk.yellow('Removing old files..'));
-    deleteFiles(outDir);
     await generateService({
         serviceUrl,
-        document: metadata,
         outDir,
-        extension: (options.extension ? '.' + options.extension : ''),
+        name: options.name,
+        extension: (options.ext ? '.js' : ''),
         fileHeader: '/*\n' +
             ' * Generated by OPRA Service Generator \n' +
             ' * Version: ' + pkgJson.version + '\n' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -28,10 +28,11 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/node-client": "^0.13.0",
+    "@opra/node-client": "^0.14.0",
     "chalk": "^5.2.0",
     "commander": "^10.0.0",
     "putil-flattentext": "^2.1.1",
+    "putil-varhelpers": "^1.6.5",
     "js-string-escape": "^1.0.1"
   },
   "devDependencies": {},

package/cjs/oprimp/generate-resoruces.js

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateResources = void 0;
-const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const common_1 = require("@opra/common");
-const string_utils_js_1 = require("../utils/string-utils.js");
-const ts_file_js_1 = require("../utils/ts-file.js");
-async function generateResources(ctx) {
-    const targetDir = path_1.default.join(ctx.absoluteDir, 'resources');
-    ctx.logger.log(chalk_1.default.yellow('Generating resources'));
-    const resourcesTs = new ts_file_js_1.TsFile();
-    resourcesTs.header = ctx.fileHeader;
-    let i = 0;
-    fs_1.default.mkdirSync(targetDir, { recursive: true });
-    const resourceNames = Array.from(ctx.document.resources.keys()).sort();
-    for (const resourceName of resourceNames) {
-        const resource = ctx.document.getResource(resourceName);
-        const tsFile = new ts_file_js_1.TsFile();
-        tsFile.header = ctx.fileHeader;
-        tsFile.content = `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(resource.description || resource.name)}
- * @type ${resource.name}
- * @kind ${resource.kind}
- * @url ${(0, common_1.joinPath)(ctx.serviceUrl, '$metadata/resources/' + resource.name)}
- */\n`;
-        const filename = `./resources/${resource.name}`;
-        if (resource instanceof common_1.CollectionResourceInfo) {
-            await generateCollectionResource(ctx, resource, tsFile);
-            await tsFile.writeFile(ctx, path_1.default.join(targetDir, resource.name + '.ts'));
-            resourcesTs.addExport(`${filename}` + ctx.extension);
-            i++;
-        }
-        else if (resource instanceof common_1.SingletonResourceInfo) {
-            await generateSingletonResource(ctx, resource, tsFile);
-            await tsFile.writeFile(ctx, path_1.default.join(targetDir, resource.name + '.ts'));
-            resourcesTs.addExport(`${filename}${ctx.extension}`);
-            i++;
-        }
-    }
-    if (i) {
-        await resourcesTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'resources.ts'));
-    }
-}
-exports.generateResources = generateResources;
-async function generateCollectionResource(ctx, resource, tsFile) {
-    tsFile.header = ctx.fileHeader;
-    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpCollectionService');
-    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
-    const methods = resource.getHandlerNames()
-        .filter(x => x !== 'count')
-        .map(x => `'${x}'`).join(' | ');
-    tsFile.content = `
-export function ${resource.name}(
-    client: OpraHttpClient
-): Pick<HttpCollectionService<${resource.dataType.name}, never>, ${methods}> {
-  return client.collection('${resource.name}');
-}
-`;
-}
-async function generateSingletonResource(ctx, resource, tsFile) {
-    tsFile.header = ctx.fileHeader;
-    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpSingletonService');
-    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
-    const methods = resource.getHandlerNames().map(x => `'${x}'`).join(' | ');
-    tsFile.content = `
-export function ${resource.name}(client: OpraHttpClient): Pick<HttpSingletonService<${resource.dataType.name}, never>, ${methods}> {
-  return client.singleton('${resource.name}');
-}
-`;
-}

package/esm/oprimp/generate-resoruces.js

@@ -1,67 +0,0 @@
-import chalk from 'chalk';
-import fs from 'fs';
-import path from 'path';
-import { CollectionResourceInfo, joinPath, SingletonResourceInfo } from '@opra/common';
-import { wrapJSDocString } from '../utils/string-utils.js';
-import { TsFile } from '../utils/ts-file.js';
-export async function generateResources(ctx) {
-    const targetDir = path.join(ctx.absoluteDir, 'resources');
-    ctx.logger.log(chalk.yellow('Generating resources'));
-    const resourcesTs = new TsFile();
-    resourcesTs.header = ctx.fileHeader;
-    let i = 0;
-    fs.mkdirSync(targetDir, { recursive: true });
-    const resourceNames = Array.from(ctx.document.resources.keys()).sort();
-    for (const resourceName of resourceNames) {
-        const resource = ctx.document.getResource(resourceName);
-        const tsFile = new TsFile();
-        tsFile.header = ctx.fileHeader;
-        tsFile.content = `\n/**\n * ${wrapJSDocString(resource.description || resource.name)}
- * @type ${resource.name}
- * @kind ${resource.kind}
- * @url ${joinPath(ctx.serviceUrl, '$metadata/resources/' + resource.name)}
- */\n`;
-        const filename = `./resources/${resource.name}`;
-        if (resource instanceof CollectionResourceInfo) {
-            await generateCollectionResource(ctx, resource, tsFile);
-            await tsFile.writeFile(ctx, path.join(targetDir, resource.name + '.ts'));
-            resourcesTs.addExport(`${filename}` + ctx.extension);
-            i++;
-        }
-        else if (resource instanceof SingletonResourceInfo) {
-            await generateSingletonResource(ctx, resource, tsFile);
-            await tsFile.writeFile(ctx, path.join(targetDir, resource.name + '.ts'));
-            resourcesTs.addExport(`${filename}${ctx.extension}`);
-            i++;
-        }
-    }
-    if (i) {
-        await resourcesTs.writeFile(ctx, path.join(ctx.absoluteDir, 'resources.ts'));
-    }
-}
-async function generateCollectionResource(ctx, resource, tsFile) {
-    tsFile.header = ctx.fileHeader;
-    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpCollectionService');
-    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
-    const methods = resource.getHandlerNames()
-        .filter(x => x !== 'count')
-        .map(x => `'${x}'`).join(' | ');
-    tsFile.content = `
-export function ${resource.name}(
-    client: OpraHttpClient
-): Pick<HttpCollectionService<${resource.dataType.name}, never>, ${methods}> {
-  return client.collection('${resource.name}');
-}
-`;
-}
-async function generateSingletonResource(ctx, resource, tsFile) {
-    tsFile.header = ctx.fileHeader;
-    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpSingletonService');
-    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
-    const methods = resource.getHandlerNames().map(x => `'${x}'`).join(' | ');
-    tsFile.content = `
-export function ${resource.name}(client: OpraHttpClient): Pick<HttpSingletonService<${resource.dataType.name}, never>, ${methods}> {
-  return client.singleton('${resource.name}');
-}
-`;
-}