Skip to content

Commit d1c85a5

Browse files
authored
Merge pull request #20 from Canner/fix/rename-to-vulcan-sql
Chore: Update package name from @vulcan to @vulcan-sql
2 parents 3d3678b + d47e5dc commit d1c85a5

File tree

127 files changed

+315
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+315
-285
lines changed

README.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
2-
3-
# Vulcan
1+
# Vulcan SQL
42

53
This project was generated using [Nx](https://nx.dev).
64

@@ -45,7 +43,7 @@ Run `nx g @nrwl/react:lib my-lib` to generate a library.
4543

4644
> You can also use any of the plugins above to generate libraries as well.
4745
48-
Libraries are shareable across libraries and applications. They can be imported from `@vulcan/mylib`.
46+
Libraries are shareable across libraries and applications. They can be imported from `@vulcan-sql/mylib`.
4947

5048
## Development server
5149

@@ -79,8 +77,6 @@ Run `nx graph` to see a diagram of the dependencies of your projects.
7977

8078
Visit the [Nx Documentation](https://nx.dev) to learn more.
8179

82-
83-
8480
## ☁ Nx Cloud
8581

8682
### Distributed Computation Caching & Distributed Task Execution

nx.json

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "nx/presets/core.json",
3-
"npmScope": "vulcan",
3+
"npmScope": "vulcan-sql",
44
"affected": {
55
"defaultBase": "main"
66
},
@@ -11,12 +11,7 @@
1111
"default": {
1212
"runner": "nx/tasks-runners/default",
1313
"options": {
14-
"cacheableOperations": [
15-
"build",
16-
"lint",
17-
"test",
18-
"e2e"
19-
]
14+
"cacheableOperations": ["build", "lint", "test", "e2e"]
2015
}
2116
}
2217
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "vulcan",
2+
"name": "vulcan-sql",
33
"version": "0.0.0",
44
"license": "MIT",
55
"scripts": {

packages/build/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@vulcan/build",
2+
"name": "@vulcan-sql/build",
33
"version": "0.0.1",
44
"type": "commonjs"
55
}

packages/build/src/containers/container.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Container as InversifyContainer } from 'inversify';
2-
import { Container as CoreContainer } from '@vulcan/core';
3-
import { IBuildOptions } from '@vulcan/build/models';
2+
import { Container as CoreContainer } from '@vulcan-sql/core';
3+
import { IBuildOptions } from '@vulcan-sql/build/models';
44
import { schemaParserModule } from './modules';
55

66
export class Container {

packages/build/src/containers/modules/schemaParser.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import { ISchemaParserOptions, SchemaReaderType } from '@vulcan/build/models';
1+
import {
2+
ISchemaParserOptions,
3+
SchemaReaderType,
4+
} from '@vulcan-sql/build/models';
25
import {
36
FileSchemaReader,
47
SchemaParser,
58
SchemaReader,
6-
} from '@vulcan/build/schema-parser';
9+
} from '@vulcan-sql/build/schema-parser';
710
import { ContainerModule, interfaces } from 'inversify';
811
import { SchemaParserOptions } from '../../options/schemaParser';
912
import { TYPES } from '../types';

packages/build/src/lib/schema-parser/middleware/addMissingErrors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AllTemplateMetadata, APISchema } from '@vulcan/core';
1+
import { AllTemplateMetadata, APISchema } from '@vulcan-sql/core';
22
import { SchemaParserMiddleware } from './middleware';
33

44
interface ErrorCode {

packages/build/src/lib/schema-parser/middleware/addRequiredValidatorForPath.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FieldInType } from '@vulcan/core';
1+
import { FieldInType } from '@vulcan-sql/core';
22
import { SchemaParserMiddleware } from './middleware';
33

44
// Add the "required" validator when the parameters are in path

packages/build/src/lib/schema-parser/middleware/checkParameter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AllTemplateMetadata, APISchema } from '@vulcan/core';
1+
import { AllTemplateMetadata, APISchema } from '@vulcan-sql/core';
22
import { SchemaParserMiddleware } from './middleware';
33

44
interface Parameter {

packages/build/src/lib/schema-parser/middleware/checkValidator.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SchemaParserMiddleware } from './middleware';
22
import { chain } from 'lodash';
3-
import { APISchema, IValidatorLoader } from '@vulcan/core';
3+
import { APISchema, IValidatorLoader } from '@vulcan-sql/core';
44

55
export const checkValidator =
66
(loader: IValidatorLoader): SchemaParserMiddleware =>

packages/build/src/lib/schema-parser/middleware/generateDataType.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FieldDataType } from '@vulcan/core';
1+
import { FieldDataType } from '@vulcan-sql/core';
22
import { DeepPartial } from 'ts-essentials';
33
import { RawResponseProperty, SchemaParserMiddleware } from './middleware';
44

packages/build/src/lib/schema-parser/middleware/generatePathParameters.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FieldDataType, FieldInType } from '@vulcan/core';
1+
import { FieldDataType, FieldInType } from '@vulcan-sql/core';
22
import { SchemaParserMiddleware } from './middleware';
33

44
// /user/{id} => {request: [{fieldName: 'id', fieldIn: 'path' ....}]}

packages/build/src/lib/schema-parser/middleware/middleware.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
RequestSchema as RequestParameter,
55
ResponseProperty,
66
ValidatorDefinition,
7-
} from '@vulcan/core';
7+
} from '@vulcan-sql/core';
88
import { DeepPartial } from 'ts-essentials';
99

1010
export interface RawRequestParameter

packages/build/src/lib/schema-parser/middleware/normalizeDataType.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FieldDataType } from '@vulcan/core';
1+
import { FieldDataType } from '@vulcan-sql/core';
22
import { DeepPartial } from 'ts-essentials';
33
import { RawResponseProperty, SchemaParserMiddleware } from './middleware';
44

packages/build/src/lib/schema-parser/middleware/normalizeFieldIn.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FieldInType } from '@vulcan/core';
1+
import { FieldInType } from '@vulcan-sql/core';
22
import { SchemaParserMiddleware } from './middleware';
33

44
// FieldIn: query => FieldIn FieldInType.QUERY

packages/build/src/lib/schema-parser/middleware/setConstraints.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { APISchema, IValidatorLoader } from '@vulcan/core';
1+
import { APISchema, IValidatorLoader } from '@vulcan-sql/core';
22
import { chain } from 'lodash';
33
import { SchemaParserMiddleware } from './middleware';
44

packages/build/src/lib/schema-parser/schema-reader/fileSchemaReader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import * as glob from 'glob';
33
import { promises as fs } from 'fs';
44
import * as path from 'path';
55
import { inject, injectable } from 'inversify';
6-
import { TYPES } from '@vulcan/build/containers';
7-
import { SchemaParserOptions } from '@vulcan/build/options';
6+
import { TYPES } from '@vulcan-sql/build/containers';
7+
import { SchemaParserOptions } from '@vulcan-sql/build/options';
88

99
export interface FileSchemaReaderOptions {
1010
folderPath: string;

packages/build/src/lib/schema-parser/schemaParser.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
TemplateMetadata,
44
TYPES as CORE_TYPES,
55
IValidatorLoader,
6-
} from '@vulcan/core';
6+
} from '@vulcan-sql/core';
77
import { SchemaData, SchemaFormat, SchemaReader } from './schema-reader';
88
import * as yaml from 'js-yaml';
99
import {
@@ -25,8 +25,8 @@ import {
2525
} from './middleware';
2626
import * as compose from 'koa-compose';
2727
import { inject, injectable, interfaces } from 'inversify';
28-
import { TYPES } from '@vulcan/build/containers';
29-
import { SchemaParserOptions } from '@vulcan/build/options';
28+
import { TYPES } from '@vulcan-sql/build/containers';
29+
import { SchemaParserOptions } from '@vulcan-sql/build/options';
3030

3131
export interface SchemaParseResult {
3232
schemas: APISchema[];

packages/build/src/lib/spec-generator/oas3/oas3SpecGenerator.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
RequestSchema as RequestParameter,
1515
RequiredConstraint,
1616
ResponseProperty,
17-
} from '@vulcan/core';
17+
} from '@vulcan-sql/core';
1818
import { isEmpty } from 'lodash';
1919

2020
export class OAS3SpecGenerator extends SpecGenerator<oas3.OpenAPIObject> {

packages/build/src/lib/spec-generator/specGenerator.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { APISchema } from '@vulcan/core';
1+
import { APISchema } from '@vulcan-sql/core';
22
import { IBuildOptions } from '../../models/buildOptions';
33

44
export abstract class SpecGenerator<T> {

packages/build/src/lib/vulcanBuilder.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { IBuildOptions } from '@vulcan/build/models';
2-
import { Container, TYPES } from '@vulcan/build/containers';
3-
import { SchemaParser } from '@vulcan/build/schema-parser';
1+
import { IBuildOptions } from '@vulcan-sql/build/models';
2+
import { Container, TYPES } from '@vulcan-sql/build/containers';
3+
import { SchemaParser } from '@vulcan-sql/build/schema-parser';
44
import {
55
TemplateEngine,
66
TYPES as CORE_TYPES,
77
VulcanArtifactBuilder,
8-
} from '@vulcan/core';
8+
} from '@vulcan-sql/core';
99

1010
export class VulcanBuilder {
1111
public async build(options: IBuildOptions) {

packages/build/src/models/buildOptions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ICoreOptions } from '@vulcan/core';
1+
import { ICoreOptions } from '@vulcan-sql/core';
22
import { ISchemaParserOptions } from './schemaParserOptions';
33

44
export interface IBuildOptions extends ICoreOptions {

packages/build/src/options/schemaParser.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { injectable, inject, optional } from 'inversify';
2-
import { TYPES } from '@vulcan/build/containers';
3-
import { ISchemaParserOptions, SchemaReaderType } from '@vulcan/build/models';
2+
import { TYPES } from '@vulcan-sql/build/containers';
3+
import {
4+
ISchemaParserOptions,
5+
SchemaReaderType,
6+
} from '@vulcan-sql/build/models';
47
import { IsOptional, IsString, validateSync } from 'class-validator';
58

69
@injectable()

packages/build/test/builder/builder.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { VulcanBuilder } from '../../src';
22
import * as path from 'path';
3-
import { IBuildOptions, SchemaReaderType } from '@vulcan/build/models';
3+
import { IBuildOptions, SchemaReaderType } from '@vulcan-sql/build/models';
44
import {
55
PersistentStoreType,
66
SerializerType,
77
TemplateProviderType,
8-
} from '@vulcan/core';
8+
} from '@vulcan-sql/core';
99

1010
it('Builder.build should work', async () => {
1111
// Arrange

packages/build/test/schema-parser/middleware/addMissingErrors.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RawAPISchema } from '../../../src';
22
import { addMissingErrors } from '../../../src/lib/schema-parser/middleware/addMissingErrors';
3-
import { AllTemplateMetadata } from '@vulcan/core';
3+
import { AllTemplateMetadata } from '@vulcan-sql/core';
44

55
it('Should add missing error codes', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/addRequiredValidatorForPath.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { addRequiredValidatorForPath } from '@vulcan/build/schema-parser/middleware';
3-
import { APISchema, FieldInType } from '@vulcan/core';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { addRequiredValidatorForPath } from '@vulcan-sql/build/schema-parser/middleware';
3+
import { APISchema, FieldInType } from '@vulcan-sql/core';
44

55
it('Should add required validator for parameter in path', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/checkParameter.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { RawAPISchema } from '../../../src';
22
import { checkParameter } from '../../../src/lib/schema-parser/middleware/checkParameter';
3-
import { AllTemplateMetadata } from '@vulcan/core';
3+
import { AllTemplateMetadata } from '@vulcan-sql/core';
44

55
it('Should pass when every parameter has been defined', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/checkValidator.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { checkValidator } from '@vulcan/build/schema-parser/middleware/checkValidator';
3-
import { IValidatorLoader } from '@vulcan/core';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { checkValidator } from '@vulcan-sql/build/schema-parser/middleware/checkValidator';
3+
import { IValidatorLoader } from '@vulcan-sql/core';
44
import * as sinon from 'ts-sinon';
55

66
it('Should pass if there is no error', async () => {

packages/build/test/schema-parser/middleware/generateDataType.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { generateDataType } from '@vulcan/build/schema-parser/middleware';
3-
import { FieldDataType } from '@vulcan/core';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { generateDataType } from '@vulcan-sql/build/schema-parser/middleware';
3+
import { FieldDataType } from '@vulcan-sql/core';
44

55
it('Should generate data type (string) for requests when it was not defined', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/generatePathParameters.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { generatePathParameters } from '@vulcan/build/schema-parser/middleware';
3-
import { FieldDataType, FieldInType } from '@vulcan/core';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { generatePathParameters } from '@vulcan-sql/build/schema-parser/middleware';
3+
import { FieldDataType, FieldInType } from '@vulcan-sql/core';
44

55
it('Should generate path parameters when they were not defined', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/generateTemplateSource.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { generateTemplateSource } from '@vulcan/build/schema-parser/middleware/generateTemplateSource';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { generateTemplateSource } from '@vulcan-sql/build/schema-parser/middleware/generateTemplateSource';
33

44
it('Should keep templateSource in schema', async () => {
55
// Arrange

packages/build/test/schema-parser/middleware/generateUrl.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { generateUrl } from '@vulcan/build/schema-parser/middleware/generateUrl';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { generateUrl } from '@vulcan-sql/build/schema-parser/middleware/generateUrl';
33

44
it('Should keep url in schema', async () => {
55
// Arrange

packages/build/test/schema-parser/middleware/normalizeDataType.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { normalizeDataType } from '@vulcan/build/schema-parser/middleware';
3-
import { FieldDataType } from '@vulcan/core';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { normalizeDataType } from '@vulcan-sql/build/schema-parser/middleware';
3+
import { FieldDataType } from '@vulcan-sql/core';
44

55
it('Should normalize data type for requests', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/normalizeInField.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { normalizeFieldIn } from '@vulcan/build/schema-parser/middleware';
3-
import { FieldInType } from '@vulcan/core';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { normalizeFieldIn } from '@vulcan-sql/build/schema-parser/middleware';
3+
import { FieldInType } from '@vulcan-sql/core';
44

55
it('Should normalize in field', async () => {
66
// Arrange

packages/build/test/schema-parser/middleware/setConstraints.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { setConstraints } from '@vulcan/build/schema-parser/middleware';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { setConstraints } from '@vulcan-sql/build/schema-parser/middleware';
33
import {
44
Constraint,
55
MinValueConstraint,
66
RequiredConstraint,
77
IValidatorLoader,
8-
} from '@vulcan/core';
8+
} from '@vulcan-sql/core';
99
import * as sinon from 'ts-sinon';
1010

1111
it('Should set and compose constraints', async () => {

packages/build/test/schema-parser/middleware/transformValidator.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { RawAPISchema } from '@vulcan/build/schema-parser';
2-
import { transformValidator } from '@vulcan/build/schema-parser/middleware/transformValidator';
1+
import { RawAPISchema } from '@vulcan-sql/build/schema-parser';
2+
import { transformValidator } from '@vulcan-sql/build/schema-parser/middleware/transformValidator';
33

44
it('Should convert string validator to proper format', async () => {
55
// Arrange

packages/build/test/schema-parser/schema-reader/fileSchemaReader.spec.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
import { FileSchemaReader, SchemaData } from '@vulcan/build/schema-parser';
1+
import { FileSchemaReader, SchemaData } from '@vulcan-sql/build/schema-parser';
22
import * as path from 'path';
33
import { Container } from 'inversify';
4-
import { TYPES } from '@vulcan/build/containers';
5-
import { SchemaParserOptions } from '@vulcan/build/options';
6-
import { ISchemaParserOptions, SchemaReaderType } from '@vulcan/build/models';
4+
import { TYPES } from '@vulcan-sql/build/containers';
5+
import { SchemaParserOptions } from '@vulcan-sql/build/options';
6+
import {
7+
ISchemaParserOptions,
8+
SchemaReaderType,
9+
} from '@vulcan-sql/build/models';
710

811
let container: Container;
912

packages/build/test/schema-parser/schema-reader/fileSchemaReaderError.spec.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import { FileSchemaReader } from '@vulcan/build/schema-parser';
1+
import { FileSchemaReader } from '@vulcan-sql/build/schema-parser';
22
import * as path from 'path';
3-
import { SchemaParserOptions } from '@vulcan/build/options';
4-
import { TYPES } from '@vulcan/build/containers';
5-
import { ISchemaParserOptions, SchemaReaderType } from '@vulcan/build/models';
3+
import { SchemaParserOptions } from '@vulcan-sql/build/options';
4+
import { TYPES } from '@vulcan-sql/build/containers';
5+
import {
6+
ISchemaParserOptions,
7+
SchemaReaderType,
8+
} from '@vulcan-sql/build/models';
69
import { Container } from 'inversify';
710

811
let container: Container;

0 commit comments

Comments
 (0)