Browse Source

feat: accept __default as placeholder for default param

pull/5204/head
Arman Ozak 6 years ago
parent
commit
dd298f3301
  1. 4
      npm/ng-packs/packages/schematics/src/commands/api/index.ts
  2. 6
      npm/ng-packs/packages/schematics/src/commands/proxy/index.ts
  3. 10
      npm/ng-packs/packages/schematics/src/utils/common.ts

4
npm/ng-packs/packages/schematics/src/commands/api/index.ts

@ -23,13 +23,15 @@ import {
getRootNamespace, getRootNamespace,
interpolate, interpolate,
ModelGeneratorParams, ModelGeneratorParams,
removeDefaultPlaceholders,
resolveProject, resolveProject,
serializeParameters, serializeParameters,
} from '../../utils'; } from '../../utils';
import * as cases from '../../utils/text'; import * as cases from '../../utils/text';
import { Schema as GenerateProxySchema } from './schema'; import { Schema as GenerateProxySchema } from './schema';
export default function(params: GenerateProxySchema) { export default function(schema: GenerateProxySchema) {
const params = removeDefaultPlaceholders(schema);
const moduleName = strings.camelize(params.module || 'app'); const moduleName = strings.camelize(params.module || 'app');
return chain([ return chain([

6
npm/ng-packs/packages/schematics/src/commands/proxy/index.ts

@ -13,11 +13,13 @@ import {
createApiDefinitionSaver, createApiDefinitionSaver,
getApiDefinition, getApiDefinition,
getSourceUrl, getSourceUrl,
removeDefaultPlaceholders,
resolveProject, resolveProject,
} from '../../utils'; } from '../../utils';
import { Schema as GenerateProxySchema } from './schema'; import { Schema as GenerateProxySchema } from './schema';
export default function(params: GenerateProxySchema) { export default function(schema: GenerateProxySchema) {
const params = removeDefaultPlaceholders(schema);
const moduleName = strings.camelize(params.module || 'app'); const moduleName = strings.camelize(params.module || 'app');
return chain([ return chain([
@ -32,7 +34,7 @@ export default function(params: GenerateProxySchema) {
data, data,
`${targetPath}/shared/api-definition.json`, `${targetPath}/shared/api-definition.json`,
); );
const createApi = schematic('api', params); const createApi = schematic('api', schema);
return branchAndMerge(chain([saveApiDefinition, createApi])); return branchAndMerge(chain([saveApiDefinition, createApi]));
}, },

10
npm/ng-packs/packages/schematics/src/utils/common.ts

@ -23,3 +23,13 @@ export function readFileInTree(tree: Tree, filePath: string): ts.SourceFile {
const text = buffer.toString('utf-8'); const text = buffer.toString('utf-8');
return ts.createSourceFile(filePath, text, ts.ScriptTarget.Latest, true); return ts.createSourceFile(filePath, text, ts.ScriptTarget.Latest, true);
} }
export function removeDefaultPlaceholders<T>(oldParams: T) {
const newParams: Record<string, any> = {};
Object.entries(oldParams).forEach(([key, value]) => {
newParams[key] = value === '__default' ? undefined : value;
});
return newParams as T;
}

Loading…
Cancel
Save