@dxos/protobuf-compiler 0.8.3 → 0.8.4-main.1da679c

package/src/generator/field.ts

@@ -7,9 +7,10 @@ import * as ts from 'typescript';
 
 import { invariant } from '@dxos/invariant';
 
-import { types } from './types';
 import { type SubstitutionsMap } from '../parser';
 
+import { types } from './types';
+
 const f = ts.factory;
 
 export const getFieldType = (field: pb.Field, subs: SubstitutionsMap): ts.TypeNode => {

package/src/generator/file-generator.ts

@@ -3,16 +3,18 @@
 //
 
 import { dirname, join } from 'path';
+
 import type pb from 'protobufjs';
 import * as ts from 'typescript';
 
+import { CODEC_MODULE, ModuleSpecifier } from '../module-specifier';
+import { getSafeNamespaceIdentifier, parseFullyQualifiedName } from '../namespaces';
+import { type SubstitutionsMap } from '../parser';
+
 import { type GeneratorContext } from './context';
 import { createDeclarations, createTypeDictionary } from './declaration-generator';
 import { createSerializerDefinition } from './serializer-definition-generator';
 import { createServicesDictionary } from './service';
-import { CODEC_MODULE, ModuleSpecifier } from '../module-specifier';
-import { getSafeNamespaceIdentifier, parseFullyQualifiedName } from '../namespaces';
-import { type SubstitutionsMap } from '../parser';
 
 const f = ts.factory;
 

package/src/generator/message.ts

@@ -3,6 +3,7 @@
 //
 
 import { dirname, relative } from 'path';
+
 import type * as protobufjs from 'protobufjs';
 import * as ts from 'typescript';
 

package/src/generator/service.ts

@@ -3,17 +3,19 @@
 //
 
 import { dirname, relative } from 'path';
+
 import pb from 'protobufjs';
 import * as ts from 'typescript';
 
 import { invariant } from '@dxos/invariant';
 
-import { type GeneratorContext } from './context';
-import { attachDocComment } from './doc-comment';
-import { types, getTypeReference } from './types';
 import { normalizeFullyQualifiedName } from '../namespaces';
 import { type SubstitutionsMap } from '../parser';
 
+import { type GeneratorContext } from './context';
+import { attachDocComment } from './doc-comment';
+import { getTypeReference, types } from './types';
+
 const f = ts.factory;
 
 const getRpcTypes = (method: pb.Method, service: pb.Service, subs: SubstitutionsMap): [ts.TypeNode, ts.TypeNode] => {

package/src/logger.ts

@@ -2,8 +2,6 @@
 // Copyright 2020 DXOS.org
 //
 
-/* eslint-disable no-console */
-
 import chalk from 'chalk';
 
 import { type ModuleSpecifier } from './module-specifier';
@@ -16,12 +14,7 @@ type LoggerOptions = {
 export class Logger {
   constructor(private readonly _options: LoggerOptions = {}) {}
 
-  // prettier-ignore
-  logCompilationOptions(
-    protoFilePaths: string[],
-    baseDirPath: string | undefined,
-    outDirPath: string
-  ): void {
+  logCompilationOptions(protoFilePaths: string[], baseDirPath: string | undefined, outDirPath: string): void {
     if (this._options?.verbose) {
       console.log(chalk`Output: {bold ${outDirPath}}`);
       console.log(chalk`Sources:`);
@@ -32,12 +25,7 @@ export class Logger {
     }
   }
 
-  // prettier-ignore
-  logParsedSubstitutions(
-    substitutionsModule: ModuleSpecifier,
-    substitutions: SubstitutionsMap
-  ): void {
-    console.log('Processing substitutions...');
+  logParsedSubstitutions(substitutionsModule: ModuleSpecifier, substitutions: SubstitutionsMap): void {
     if (this._options?.verbose) {
       console.log(chalk`Definitions: {bold ${substitutionsModule.resolve()}}`);
       if (Object.keys(substitutions).length > 0) {

package/src/main.ts

@@ -4,8 +4,10 @@
 // Copyright 2020 DXOS.org
 //
 
-import { ArgumentParser } from 'argparse';
 import { resolve } from 'node:path';
+
+import { ArgumentParser } from 'argparse';
+import glob from 'glob';
 import readPkg from 'read-pkg';
 
 import { preconfigureProtobufjs } from './configure';
@@ -21,7 +23,7 @@ const main = async () => {
   });
 
   parser.add_argument('-v', '--version', { action: 'version', version } as any);
-  parser.add_argument('proto', { help: 'Protobuf input files', nargs: '+' }); // TODO(burdon): Glob.
+  parser.add_argument('--src', { help: 'Protobuf input files' });
   parser.add_argument('-s', '--substitutions', { help: 'Substitutions file' });
   parser.add_argument('--baseDir', {
     help: 'Base path to resolve fully qualified packages',
@@ -31,9 +33,9 @@ const main = async () => {
     required: true,
   });
 
-  const { proto, substitutions, baseDir, outDir } = parser.parse_args();
+  const { src, substitutions, baseDir, outDir } = parser.parse_args();
 
-  const protoFilePaths = proto.map((file: string) => resolve(process.cwd(), file));
+  const protoFilePaths = glob.sync(src, { cwd: process.cwd() }).map((file: string) => resolve(process.cwd(), file));
   const substitutionsModule = substitutions
     ? ModuleSpecifier.resolveFromFilePath(substitutions, process.cwd())
     : undefined;
@@ -44,7 +46,17 @@ const main = async () => {
   registerResolver(baseDirPath);
   preconfigureProtobufjs();
 
-  await parseAndGenerateSchema(substitutionsModule, protoFilePaths, baseDirPath, outDirPath, process.cwd());
+  await parseAndGenerateSchema(
+    substitutionsModule,
+    protoFilePaths,
+    baseDirPath,
+    outDirPath,
+    process.cwd(),
+    // TODO(wittjosiah): Expose as args.
+    undefined,
+    true,
+    false,
+  );
 };
 
 void main();

package/src/module-specifier.ts

@@ -3,7 +3,7 @@
 //
 
 import { createRequire } from 'node:module';
-import { isAbsolute, resolve, relative } from 'path';
+import { isAbsolute, relative, resolve } from 'path';
 
 import { invariant } from '@dxos/invariant';
 

package/src/namespaces.test.ts

@@ -2,9 +2,10 @@
 // Copyright 2020 DXOS.org
 //
 
+import { join, resolve } from 'path';
+
 import expect from 'expect';
 import { it as test } from 'mocha';
-import { resolve, join } from 'path';
 import pb from 'protobufjs';
 
 import { preconfigureProtobufjs } from './configure';

package/src/parser/resolver.ts

@@ -5,6 +5,7 @@
 import { existsSync } from 'fs';
 import { createRequire } from 'node:module';
 import { basename, dirname, join } from 'path';
+
 import pb from 'protobufjs';
 
 const require = createRequire(import.meta.url);
@@ -25,7 +26,7 @@ export function createProtoResolver(original: ProtoResolver, baseDir?: string):
 
     try {
       // Test if referenced package.
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      // eslint-disable-next-line @typescript-eslint/no-require-imports
       const config = require(join(target, 'package.json'));
       if (typeof config.protobuf !== 'string') {
         throw new Error(`Package "${target}" does not expose "protobuf" file.`);

package/src/type-generator.ts

@@ -4,19 +4,20 @@
 
 import { existsSync, mkdirSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
+
 import pb from 'protobufjs';
 import * as ts from 'typescript';
 
 import {
   createIndexSourceFile,
   createNamespaceSourceFile,
-  getFileNameForNamespace,
   generatePackageExports,
+  getFileNameForNamespace,
 } from './generator';
 import { Logger } from './logger';
 import { type ModuleSpecifier } from './module-specifier';
 import { splitSchemaIntoNamespaces } from './namespaces';
-import { parseSubstitutionsFile, type SubstitutionsMap } from './parser';
+import { type SubstitutionsMap, parseSubstitutionsFile } from './parser';
 
 // TODO(dmaretskyi): Move all parsing into `generateSchema` and remove this function.
 export const parseAndGenerateSchema = async (